From c27bbcc497711df8b13d096f4917b5a8f16508c9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期日, 28 九月 2025 10:28:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
index 541d41c..914f8bd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java
@@ -74,6 +74,9 @@
     private LocalDate updateTime;
 
     //鏌ヨ鐢�
+    //娴佺▼鍗¢潰绉�
+    @TableField(select = false,exist = false)
+    private Double computeGrossArea;
     //鏍囩鎵撳嵃鏁伴噺
     @TableField(select = false,exist = false)
     private Integer printQuantity;
@@ -105,6 +108,12 @@
     //琛ョ墖鐘舵��
     @TableField(select = false,exist = false)
     private Integer patchState;
+    //鎵规
+    @TableField(select = false,exist = false)
+    private String batch;
+    //浜у搧鍚嶇О
+    @TableField(select = false,exist = false)
+    private String productName;
 
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)
@@ -118,4 +127,6 @@
 
     @TableField(select = false,exist= false)
     private  Product product;
+
+
 }

--
Gitblit v1.8.0