From d1302c929961b5ca0ed0845ddc2d5d51373701c7 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 15:50:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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