From ecb4007518d3b3fb658dcd3fdcf3d87083874bdf Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期二, 23 四月 2024 19:11:33 +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 | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 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..0787b09 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,18 @@ 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 javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +//import javax.persistence.Id; + +import java.io.Serializable; /** * <p> - * + * * </p> * * @author zhoush @@ -23,7 +28,12 @@ /** * id */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) + + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; /** -- Gitblit v1.8.0