From eef4b7ca66cc2fb34d2d2cb0a4a8643f2bb0f838 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 18 十月 2024 13:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   13 +++++++++++++
 1 files changed, 13 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 3f69894..f7847a9 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
@@ -79,6 +79,19 @@
     @TableField(select = false,exist = false)
     private Integer merge;
 
+    //琛ョ墖鍘熷洜
+    @TableField(select = false,exist = false)
+    private String patchReason;
+    //宸ョ▼鍙�
+    @TableField(select = false,exist = false)
+    private String projectNo;
+    //鐗堝浘ID
+    @TableField(select = false,exist = false)
+    private String stockId;
+    //灏忕墖鏁伴噺
+    @TableField(select = false,exist = false)
+    private String glassCount;
+
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)
     private Order order;

--
Gitblit v1.8.0