From 22fb46f2db1714a6b450b353669d26908884653f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 24 十月 2024 10:48:06 +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 |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 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 0249fa8..fd2713d 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,42 +2,64 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+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 {
 
     private static final long serialVersionUID = 1L;
+//    public Object getEndTime;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-
     /**
      * 璧峰鏍煎瓙
      */
-    private Integer originateSlot;
-
+    private Integer startSlot;
+    /**
+     * 鐩爣鏍煎瓙
+     */
+    private Integer endSlot;
+    /**
+     * 鏋跺瓙鍙�
+     */
+    private Integer shelf;
+    /**
+     * 鍘熺墖鏁伴噺
+     */
+    private Integer patternQuantity;
+    /**
+     * 浠诲姟绫诲瀷
+     */
+    private Integer taskType;
     /**
      * 浠诲姟鐘舵��
      */
-    private Integer enableState;
+    private Integer taskState;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private Date createTime;
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    private LocalDateTime createTime;
+    private Date updateTime;
 
 
 }

--
Gitblit v1.8.0