From 34f862e50eda729da5ed06073fc127682d651495 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 25 十二月 2024 16:12:34 +0800
Subject: [PATCH] 钢化查询添加显示版图所占格子号，大理片笼高度限制
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 11 +++++++++--
1 files changed, 9 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..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
@@ -144,7 +144,14 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
-
+ private Integer combine;
+ /**
+ * 棰勬帓鏍煎瓙
+ */
+ private Integer targetSlot;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0