From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +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 |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 24cc506..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
@@ -1,13 +1,16 @@
 package com.mes.downglassinfo.entity;
 
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Id;
 import org.springframework.stereotype.Component;
+
+
+import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zhoush
@@ -23,7 +26,8 @@
     /**
      * 涓嬬墖鐜荤拑淇℃伅琛╥d
      */
-      private Long id;
+
+    private Long id;
 
     /**
      * 娴佺▼鍗″彿
@@ -50,8 +54,15 @@
      */
     private Double thickness;
 
-
+    /**
+     * 鑶滅郴
+     */
     private String Filmsid;
 
+    /**
+     * 鐜荤拑id
+     */
+    private String glassId;
+
 
 }

--
Gitblit v1.8.0