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

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java |   15 ++++++++++++---
 1 files changed, 12 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 c9321fa..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
@@ -24,13 +24,23 @@
     /**
      * 宸ョ▼琛╥d
      */
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 宸ョ▼鍙�
      */
-    private String  engineerId;
+    private String engineerId;
+
+    /**
+     * 璁惧
+     */
+    private Integer stationCell;
+
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 
     /**
      * 宸ョ▼鍚嶇О
@@ -96,6 +106,5 @@
      * 澶囨敞
      */
     private String notes;
-
 
 }

--
Gitblit v1.8.0