From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java index 97bd560..f5300b1 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java @@ -2,13 +2,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.data.annotation.Id; + +import java.io.Serializable; /** * <p> - * + * * </p> * * @author zhoush @@ -20,21 +22,19 @@ private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(value = "id", type = IdType.AUTO) + @Id + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 瀹� */ - private Double width; + private double width; /** * 楂� */ - private Double height; + private double height; /** * 鑶滅郴 @@ -44,7 +44,7 @@ /** * 鍘氬害 */ - private Double thickness; + private double thickness; /** * 娴佺▼鍗″彿 @@ -55,6 +55,18 @@ * 浠诲姟鐘舵�� */ private Integer state; + /** + * 鐜荤拑ID + */ + private String glassId; + /** + * 宸ヤ綅id + */ + private String workstationid; + /** + * 鏈哄櫒浜� + */ + private String Robot; } -- Gitblit v1.8.0