From 211cd083bc9fc1871779802650dfe0e607d8ca77 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 10 五月 2024 08:25:12 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 20 +++++++++++--------- 1 files changed, 11 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 54fe265..7ac060a 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,11 +22,9 @@ private static final long serialVersionUID = 1L; - /** - * id - */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; + @Id + @TableId(value = "id", type = IdType.AUTO) + private Long id; /** * 瀹� @@ -55,6 +55,8 @@ * 浠诲姟鐘舵�� */ private Integer state; - - + /** + * 鐜荤拑 + */ + private String glassId; } -- Gitblit v1.8.0