From 119baa8e4d47b8af6117dd0bbe35fd1755504ee1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 22:20:03 +0800
Subject: [PATCH] 1、卧理不同界面报破损功能优化 2、大理片笼新增按照钢化版图查询笼内玻璃信息

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 66912e6..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
@@ -35,7 +35,7 @@
     /**
      * 娴佺▼鍗$幓鐠冪被鍨�
      */
-    private String glassType;
+    private Integer glassType;
 
     /**
      * 瀹�
@@ -101,6 +101,15 @@
      * 鍘熺墖椤哄簭
      */
     private Integer patternSequence;
+    /**
+     * x鍧愭爣
+     */
+    private Integer xAxis;
+
+    /**
+     * y鍧愭爣
+     */
+    private Integer yAxis;
 
     /**
      * 閽㈠寲鐗堝浘id
@@ -141,6 +150,18 @@
      * 鐜荤拑ID
      */
     private String glassId;
+    /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer combine;
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
 
 
 }

--
Gitblit v1.8.0