From 47ab1c46b5141f572381a2a27613f728e3bf96c5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 20 五月 2024 14:18:16 +0800
Subject: [PATCH] 1、卧式理片笼对接过程中bug修复 2、上片机协议修改 3、临时解决json文件打包后读取不到文件问题 4、上片新增接口修改上片机联动请求

---
 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