From 091e7f6c7c22e327796f1bee9d882881ebc81a3a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 23 八月 2024 16:06:04 +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 | 2 ++
1 files changed, 2 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 22dc95f..4378f0a 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
@@ -71,6 +71,8 @@
private String glassChild;
//宸ヨ壓娴佺▼
private String process;
+ //娴佺▼鍗″悎骞�
+ private Integer merge;
//澶栭敭璁㈠崟琛�
@TableField(select = false,exist= false)
--
Gitblit v1.8.0