From b6480bb8991e83a2efd5e4835ccc8ed0e87c067a Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 22 七月 2024 14:14:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java index ef7ffd5..e2da1a1 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * <p> @@ -28,29 +29,35 @@ private Long id; /** + * 鐜荤拑id + */ + private String glassId; + + + /** * 璧峰 */ - private String startCell; + private Integer startCell; /** * 鐩爣 */ - private String endCell; + private Integer endCell; /** * 浠诲姟绫诲瀷 1:杩� 2锛氬嚭 */ - private String taskType; + private Integer taskType; /** * 瀹� */ - private Double width; + private Integer width; /** * 楂� */ - private Double height; + private Integer height; /** * 鑶滅郴 @@ -60,17 +67,24 @@ /** * 鍘氬害 */ - private Double thickness; + private Integer thickness; /** * 娴佺▼鍗″彿 */ private String flowCardId; + /** + * 灞傚彿 + */ + private int layer; /** * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝e湪杩涜 2瀹屾垚 */ - private Integer taskStauts; + private Integer taskStatus; - + /** + * 鍒涘缓鏃堕棿 + */ + private Date CreateTime; } -- Gitblit v1.8.0