From 4170df95c30c0e761ce14ed1a33d1bccfe542c34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 九月 2024 16:27:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..8026eab 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
@@ -20,14 +20,35 @@
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;
+
+ /**
+ * 浠诲姟ID
+ */
+ private Integer enableId;
/**
* 璧峰鏍煎瓙
*/
private Integer originateSlot;
+
+ /**
+ * 鐩爣鏍煎瓙
+ */
+ private Integer endSlot;
+
+ /**
+ * 鍘熺墖鏁伴噺
+ */
+ private String patternQuantity;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ private Integer enableType;
/**
* 浠诲姟鐘舵��
@@ -37,7 +58,8 @@
/**
* 鍒涘缓鏃堕棿
*/
- private LocalDateTime createTime;
+ private String createTime;
+
}
--
Gitblit v1.8.0