From c2a11183357181439060456f6d33b50438d25c5b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 23 九月 2024 13:37:51 +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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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..a31fa99 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,10 +2,10 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* <p>
@@ -20,8 +20,9 @@
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;
/**
@@ -30,14 +31,30 @@
private Integer originateSlot;
/**
+ * 鐩爣鏍煎瓙
+ */
+ private Integer endSlot;
+
+ /**
+ * 鍘熺墖鏁伴噺
+ */
+ private String patternQuantity;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ private Integer taskType;
+
+ /**
* 浠诲姟鐘舵��
*/
- private Integer enableState;
+ private Integer taskState;
/**
* 鍒涘缓鏃堕棿
*/
- private LocalDateTime createTime;
+ private String createTime;
+
}
--
Gitblit v1.8.0