From 8c29a327707574f1e04cd25218e05ba9b4c8e4a8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 九月 2024 09:59:20 +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 | 9 +++++++++
1 files changed, 9 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..95e8090 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,14 +67,22 @@
//鏌ヨ鐢�
//鎶ュ伐缂栧彿
+ @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 String patchReason;
+
//澶栭敭璁㈠崟琛�
@TableField(select = false,exist= false)
private Order order;
--
Gitblit v1.8.0