From e18062feb4097017d21ab9c87728020a0043742b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 11:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 6ef464d..d0ff6d9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -144,7 +144,10 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
-
+ private Integer combine;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0