From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java |   14 ++++++++++++++
 1 files changed, 14 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 681a449..541d41c 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
@@ -60,12 +60,23 @@
     private LocalDate splitFrameTime;
     //鎺掑簭
     private Integer sort;
+    //鏋跺彿
+    private String rack;
+    //璁㈠崟杞Щ瀵煎叆鏁伴噺
+    private Integer importNumber;
+    //璁㈠崟杞Щ瀵煎嚭鏁伴噺
+    private Integer exportNumber;
+    //杩炵嚎鐘舵��(0涓嶈繛绾�1杩炵嚎锛岄粯璁�1锛屾坊鍔犳椂闂�
+    private Integer onlineStatus;
     //寤虹珛鏃堕棿
     private LocalDate createTime;
     //淇敼鏃堕棿
     private LocalDate updateTime;
 
     //鏌ヨ鐢�
+    //鏍囩鎵撳嵃鏁伴噺
+    @TableField(select = false,exist = false)
+    private Integer printQuantity;
     //鎶ュ伐缂栧彿
     @TableField(select = false,exist = false)
     private String reportingWorkId;
@@ -91,6 +102,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