From a8c1dd008f9a096cb01774f17a8bceda5aafed88 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 26 二月 2025 15:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 10 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 dfa7b6e..d2a4401 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
@@ -2,13 +2,14 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wu
@@ -39,17 +40,17 @@
     /**
      * 瀹�
      */
-    private Double width;
+    private double width;
 
     /**
      * 楂�
      */
-    private Double height;
+    private double height;
 
     /**
      * 鍘氬害
      */
-    private Double thickness;
+    private double thickness;
 
     /**
      * 鑶滅郴
@@ -57,14 +58,24 @@
     private String filmsid;
 
     /**
+     * 灞傛暟
+     */
+    private int layer;
+
+    /**
+     * 鎬诲眰鏁�
+     */
+    private int totalLayer;
+
+    /**
      * 纾ㄥ墠瀹�
      */
-    private Double edgWidth;
+    private double edgWidth;
 
     /**
      * 纾ㄥ墠楂�
      */
-    private Double edgHeight;
+    private double edgHeight;
 
     /**
      * 鏄惁閰嶇墖
@@ -74,12 +85,12 @@
     /**
      * 閰嶇墖鏈�澶у
      */
-    private Double maxWidth;
+    private double maxWidth;
 
     /**
      * 閰嶇墖鏈�澶ч珮
      */
-    private Double maxHeight;
+    private double maxHeight;
 
     /**
      * 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -90,6 +101,15 @@
      * 鍘熺墖椤哄簭
      */
     private Integer patternSequence;
+    /**
+     * x鍧愭爣
+     */
+    private Integer xAxis;
+
+    /**
+     * y鍧愭爣
+     */
+    private Integer yAxis;
 
     /**
      * 閽㈠寲鐗堝浘id
@@ -114,7 +134,7 @@
     /**
      * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
      */
-    private Integer angle;
+    private double angle;
 
     /**
      * 宸ョ▼鍙�
@@ -130,6 +150,22 @@
      * 鐜荤拑ID
      */
     private String glassId;
+    /**
+     * 鏄惁鍚堝苟
+     */
+    private Integer combine;
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
+    /**
+     * 闄よ啘鏂瑰紡
+     */
+    private Integer filmRemove;
+    /**
+     * 鐘舵��
+     */
+    private Integer status;
 
 
 }

--
Gitblit v1.8.0