From cb2b0e73ae2e729126f8d04a06d05e9460517cbc Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 20 五月 2024 14:26:43 +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 |   17 ++++++++++++++---
 1 files changed, 14 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 adb87cf..15cbb9f 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,18 @@
      * 浠诲姟鐘舵��
      */
     private Integer state;
+    /**
+     * 鐜荤拑ID
+     */
+    private String glassId;
 
+    /**
+     * 宸ヤ綅id
+     */
+    private String workstationid;
 
+    /**
+     * 鏈哄櫒浜�
+     */
+    private String Robot;
 }

--
Gitblit v1.8.0