From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 0c0f832..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,6 +52,7 @@
* 浠诲姟绫诲瀷
*/
private Integer taskType;
+
/**
* 鍒涘缓鏃堕棿
*/
--
Gitblit v1.8.0