From 2ed98bc1fc4ad46ff746ff82b92bcd199706cc76 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 二月 2025 10:01:10 +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 |    8 +++++++-
 1 files changed, 7 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 f7847a9..6c8ec86 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;
     //宸蹭紭鍖栨暟閲�
@@ -66,6 +66,9 @@
     private LocalDate updateTime;
 
     //鏌ヨ鐢�
+    //鏍囩鎵撳嵃鏁伴噺
+    @TableField(select = false,exist = false)
+    private Integer printQuantity;
     //鎶ュ伐缂栧彿
     @TableField(select = false,exist = false)
     private String reportingWorkId;
@@ -91,6 +94,9 @@
     //灏忕墖鏁伴噺
     @TableField(select = false,exist = false)
     private String glassCount;
+    //琛ョ墖鐘舵��
+    @TableField(select = false,exist = false)
+    private Integer patchState;
 
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)

--
Gitblit v1.8.0