From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
index ddc80fe..e23597e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -189,6 +189,15 @@
      */
     private Date updateTime;
 
+//    /**
+//     * 闄よ啘鏂瑰紡
+//     */
+//    private Integer filmRemove;
+//
+//    /**
+//     * 璁惧
+//     */
+//    private Integer stationCell;
     /**
      * 棰勭暀锛屼娇鐢ㄩ渶娉ㄦ槑
      */

--
Gitblit v1.8.0