From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 c9321fa..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
@@ -97,5 +97,13 @@
      */
     private String notes;
 
+    /**
+     * 涓婄墖鏈虹嚎璺�
+     */
+    private Integer stationCell;
 
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 }

--
Gitblit v1.8.0