From 7d7ad3200c9657b521abf54fef4eb0e8603ef4c1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 03 三月 2025 09:28:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java | 26 ++++++++++----------------
1 files changed, 10 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 a4f890b..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
@@ -17,6 +17,14 @@
*/
private Integer taskRunning;
/**
+ * 纾ㄨ竟鍓嶇幓鐠僫d
+ */
+ private String glassId;
+ /**
+ * 鏄惁灏变綅
+ */
+ private Integer inPlace;
+ /**
* 杩涚墖鐜荤拑id
*/
private String glassIdIn;
@@ -44,22 +52,7 @@
* 浠诲姟绫诲瀷
*/
private Integer taskType;
- /**
- * 瀹�
- */
- private Integer width;
- /**
- * 楂�
- */
- private Integer height;
- /**
- * 鍘�
- */
- private Integer thickness;
- /**
- * 鏄惁闄よ啘
- */
- private Integer filmRemove;
+
/**
* 鍒涘缓鏃堕棿
*/
@@ -69,4 +62,5 @@
*/
private Date updateTime;
+
}
--
Gitblit v1.8.0