From 817a1c3860032705a9510fa26371d50cde073f1c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 十二月 2024 11:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index 577148c..c9576ae 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -32,11 +32,15 @@
      */
     private String engineerId;
 
-
     /**
      * 璁惧
      */
-    private String stationCell;
+    private Integer stationCell;
+
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 
     /**
      * 宸ョ▼鍚嶇О
@@ -102,6 +106,5 @@
      * 澶囨敞
      */
     private String notes;
-
 
 }

--
Gitblit v1.8.0