From ba714cd764bb95cb00c57e93017905c5a03e4079 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 30 十月 2025 12:12:14 +0800
Subject: [PATCH] 1、 二号线禁用时且一拖二情况下优化

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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..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
@@ -145,6 +154,14 @@
      * 鏄惁鍚堝苟
      */
     private Integer combine;
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 
 
 }

--
Gitblit v1.8.0