From 07d08f8dc420ba47f66587fdc5038a59fc340c96 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 29 八月 2024 10:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   15 +++++++++++++++
 1 files changed, 15 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 7918d4a..3f69894 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
@@ -56,6 +56,7 @@
     //鍒嗘灦鍛�
     private String founder;
     //鍒嗘灦鏃堕棿
+    @TableField(value = "`splitFrame_time`")
     private LocalDate splitFrameTime;
     //鎺掑簭
     private Integer sort;
@@ -64,6 +65,20 @@
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
+    //鏌ヨ鐢�
+    //鎶ュ伐缂栧彿
+    @TableField(select = false,exist = false)
+    private String reportingWorkId;
+    //浜у搧鍚嶇О
+    @TableField(select = false,exist = false)
+    private String glassChild;
+    //宸ヨ壓娴佺▼
+    @TableField(select = false,exist = false)
+    private String process;
+    //娴佺▼鍗″悎骞�
+    @TableField(select = false,exist = false)
+    private Integer merge;
+
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)
     private Order order;

--
Gitblit v1.8.0