From 3633e4fac369d00b8da0c2fd4f867df097fa083a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 02 一月 2025 14:13:19 +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