From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
index f37361a..5543ab5 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -2,7 +2,9 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Id;
 import org.springframework.stereotype.Component;
+
 
 import java.io.Serializable;
 
@@ -24,7 +26,8 @@
     /**
      * 涓嬬墖鐜荤拑淇℃伅琛╥d
      */
-    private int id;
+
+    private Long id;
 
     /**
      * 娴佺▼鍗″彿
@@ -51,8 +54,15 @@
      */
     private Double thickness;
 
-
+    /**
+     * 鑶滅郴
+     */
     private String Filmsid;
 
+    /**
+     * 鐜荤拑id
+     */
+    private String glassId;
+
 
 }

--
Gitblit v1.8.0