From 09be761e45c76c095ddbae1c401d780bae162fdd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 五月 2024 19:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 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 0787b09..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
@@ -5,9 +5,6 @@
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;
@@ -25,15 +22,8 @@
private static final long serialVersionUID = 1L;
- /**
- * id
- */
- @TableId(value = "id", type = IdType.AUTO)
-
-
-
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -65,6 +55,8 @@
* 浠诲姟鐘舵��
*/
private Integer state;
-
-
+ /**
+ * 鐜荤拑ID
+ */
+ private String glassId;
}
--
Gitblit v1.8.0