From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 15 +++++++++++++--
1 files changed, 13 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..ddfc5f4 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,18 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
-
+ private Integer combine;
+ /**
+ * 棰勬帓鏍煎瓙
+ */
+ private Integer targetSlot;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
+ /**
+ * 鐢熶骇鐘舵��
+ */
+ private Integer productionStatus;
}
--
Gitblit v1.8.0