From 8785b6b5ee9298308752b53bf546953ae49b8c88 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 a31fa99..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
@@ -2,20 +2,23 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
- *
+ *
* </p>
*
* @author wf
* @since 2024-09-10
*/
@Data
+@Builder
@EqualsAndHashCode(callSuper = false)
public class RawGlassStorageTask implements Serializable {
@@ -24,37 +27,34 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 璧峰鏍煎瓙
*/
- private Integer originateSlot;
-
+ private Integer startSlot;
/**
* 鐩爣鏍煎瓙
*/
private Integer endSlot;
-
+ /**
+ * 鏋跺瓙鍙�
+ */
+ private Integer shelf;
/**
* 鍘熺墖鏁伴噺
*/
- private String patternQuantity;
-
+ private Integer patternQuantity;
/**
* 浠诲姟绫诲瀷
*/
private Integer taskType;
-
/**
* 浠诲姟鐘舵��
*/
private Integer taskState;
-
/**
* 鍒涘缓鏃堕棿
*/
- private String createTime;
-
+ private Date createTime;
}
--
Gitblit v1.8.0