From f01ebd5c94d854e2a63b23d9be2c0dd9e0aaf4bd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 22 十月 2024 08:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
index dbb2816..dbef25a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
@@ -36,6 +36,10 @@
      */
     private Integer endSlot;
     /**
+     * 鏋跺瓙鍙�
+     */
+    private Integer shelf;
+    /**
      * 鍘熺墖鏁伴噺
      */
     private Integer patternQuantity;
@@ -46,7 +50,7 @@
     /**
      * 浠诲姟鐘舵��
      */
-    private Integer enableState;
+    private Integer taskState;
     /**
      * 鍒涘缓鏃堕棿
      */

--
Gitblit v1.8.0