From 29077c9254b3a7d093203ed912d5a5f940f4bb28 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十二月 2024 15:54:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 f7feafb..81cb630 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
@@ -145,6 +145,13 @@
* 鏄惁鍚堝苟
*/
private Integer combine;
-
+ /**
+ * 棰勬帓鏍煎瓙
+ */
+ private Integer targetSlot;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0