From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java
index dccd5ed..f0ff158 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java
@@ -21,6 +21,10 @@
*/
private String glassId;
/**
+ * 鏄惁灏变綅
+ */
+ private Integer inPlace;
+ /**
* 杩涚墖鐜荤拑id
*/
private String glassIdIn;
@@ -48,22 +52,7 @@
* 浠诲姟绫诲瀷
*/
private Integer taskType;
- /**
- * 瀹�
- */
- private Integer width;
- /**
- * 楂�
- */
- private Integer height;
- /**
- * 鍘�
- */
- private Integer thickness;
- /**
- * 鏄惁闄よ啘
- */
- private Integer filmRemove;
+
/**
* 鍒涘缓鏃堕棿
*/
@@ -73,4 +62,5 @@
*/
private Date updateTime;
+
}
--
Gitblit v1.8.0