From 0307175c4c3631fe68b4d0a3a921bc56678ba68b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 03 十二月 2024 09:13:42 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
index ecc9fe8..207e536 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -96,10 +96,14 @@
      * 澶囨敞
      */
     private String notes;
+
     /**
      * 涓婄墖鏈虹嚎璺�
      */
-    private int stationCell;
+    private Integer stationCell;
 
-
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 }

--
Gitblit v1.8.0