From 569c889395ebe14caf48820e7bfb0551357ec0d2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 10 九月 2025 08:59:52 +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 |   19 +++++++++++++++++++
 1 files changed, 19 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 a8ab5bc..f9d6548 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,6 +60,14 @@
     private LocalDate splitFrameTime;
     //鎺掑簭
     private Integer sort;
+    //鏋跺彿
+    private String rack;
+    //璁㈠崟杞Щ瀵煎叆鏁伴噺
+    private Integer importNumber;
+    //璁㈠崟杞Щ瀵煎嚭鏁伴噺
+    private Integer exportNumber;
+    //杩炵嚎鐘舵��(0涓嶈繛绾�1杩炵嚎锛岄粯璁�1锛屾坊鍔犳椂闂�
+    private Integer onlineStatus;
     //寤虹珛鏃堕棿
     private LocalDate createTime;
     //淇敼鏃堕棿
@@ -94,6 +102,15 @@
     //灏忕墖鏁伴噺
     @TableField(select = false,exist = false)
     private String glassCount;
+    //琛ョ墖鐘舵��
+    @TableField(select = false,exist = false)
+    private Integer patchState;
+    //鎵规
+    @TableField(select = false,exist = false)
+    private String batch;
+    //浜у搧鍚嶇О
+    @TableField(select = false,exist = false)
+    private String productName;
 
     //澶栭敭璁㈠崟琛�
     @TableField(select = false,exist= false)
@@ -107,4 +124,6 @@
 
     @TableField(select = false,exist= false)
     private  Product product;
+
+
 }

--
Gitblit v1.8.0