From 9b8d63e96ab1930c4eeff26f0764af800284120c Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期二, 09 七月 2024 14:23:38 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 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 5903d00..79f62f9 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 @@ -1,10 +1,12 @@ package com.mes.downglassinfo.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * <p> @@ -23,33 +25,39 @@ /** * id */ - @TableId(value = "id") + @TableId(value = "id", type = IdType.AUTO) 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; /** * 鑶滅郴 @@ -59,12 +67,16 @@ /** * 鍘氬害 */ - private Double thickness; + private Integer thickness; /** * 娴佺▼鍗″彿 */ private String flowCardId; + /** + * 灞傚彿 + */ + private int layer; /** * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝e湪杩涜 2瀹屾垚 @@ -72,7 +84,7 @@ private Integer taskStauts; /** - * 鐜荤拑id + * 鍒涘缓鏃堕棿 */ - private String glassId; + private Date CreateTime; } -- Gitblit v1.8.0