From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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..681a449 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
@@ -26,7 +26,7 @@
//搴忓彿
private Integer orderNumber;
//宸ヨ壓纭搴忓彿
- private Integer technologyNumber;
+ private String technologyNumber;
//鍒嗘灦鏁伴噺
private Integer quantity;
//宸蹭紭鍖栨暟閲�
@@ -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