From 1467d91c4dbface566a81cd7d7a51ffada173465 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期一, 27 五月 2024 09:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 081732b..9f8583a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -55,7 +55,7 @@
     /**
      * 鑶滅郴
      */
-    private Integer filmsid;
+    private String filmsid;
 
     /**
      * 纾ㄥ墠瀹�
@@ -120,12 +120,17 @@
     /**
      * 宸ョ▼鍙�
      */
-    private Integer engineerId;
+    private String engineerId;
 
     /**
      * 鐢熶骇瑙勫垯id
      */
     private Integer ruleId;
 
+    /**
+     * 鐜荤拑ID
+     */
+    private String glassId;
+
 
 }

--
Gitblit v1.8.0