From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 26 十二月 2024 23:57:34 +0800
Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造：新增开始/暂停/结束任务按钮，流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造：新增除膜信息、李赛克文件需要的数据信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 19 ++++++++++++++++++-
1 files changed, 18 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 6ef464d..b9f5401 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
@@ -101,6 +101,15 @@
* 鍘熺墖椤哄簭
*/
private Integer patternSequence;
+ /**
+ * x鍧愭爣
+ */
+ private Integer xAxis;
+
+ /**
+ * y鍧愭爣
+ */
+ private Integer yAxis;
/**
* 閽㈠寲鐗堝浘id
@@ -144,7 +153,15 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
+ private Integer combine;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
+ /**
+ * 闄よ啘鏂瑰紡
+ */
+ private Integer filmRemove;
}
--
Gitblit v1.8.0