From 5a7683e98e626cba3b52fd621b4d5340e16b6f2a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
index 52fa1bc..821c41b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/UpPattenUsage.java
@@ -62,14 +62,14 @@
      */
     private Integer state;
 
-    /**
-     * 闄よ啘鏂瑰紡
-     */
-    private Integer filmRemove;
-
-    /**
-     * 璁惧
-     */
-    private Integer stationCell;
+//    /**
+//     * 闄よ啘鏂瑰紡
+//     */
+//    private Integer filmRemove;
+//
+//    /**
+//     * 璁惧
+//     */
+//    private Integer stationCell;
 
 }

--
Gitblit v1.8.0