From 8db5b45c853fe5e49f2bca9047ea63e739cb8d79 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 25 五月 2024 08:21:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 082c2b3..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
@@ -9,7 +9,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -24,7 +24,7 @@
/**
* 鐜荤拑淇℃伅琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -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