From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 9af1d08..56172d8 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -32,7 +32,7 @@
* 娴佺▼鍗�
*/
@TableField("flow_card_Id")
- private String flowcardId;
+ private String flowCardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
@@ -57,7 +57,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsid;
+ private String filmsid;
/**
* 纾ㄥ墠瀹�
@@ -128,6 +128,8 @@
* 鐢熶骇瑙勫垯id
*/
private Integer ruleId;
-
-
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
}
--
Gitblit v1.8.0