From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +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 |    5 +++++
 1 files changed, 5 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 4378f0a..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;
@@ -66,12 +67,16 @@
 
     //鏌ヨ鐢�
     //鎶ュ伐缂栧彿
+    @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;
 
     //澶栭敭璁㈠崟琛�

--
Gitblit v1.8.0