From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 10 五月 2024 16:29:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 adb87cf..29e8dfc 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.data.annotation.Id; import java.io.Serializable; @@ -21,9 +22,7 @@ private static final long serialVersionUID = 1L; - /** - * id - */ + @Id @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -56,6 +55,8 @@ * 浠诲姟鐘舵�� */ private Integer state; - - + /** + * 鐜荤拑ID + */ + private String glassId; } -- Gitblit v1.8.0