From 0805eb4ef9b0342e11d3a938b879df1b93de5520 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 06 九月 2024 15:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 f1fa50d..f7feafb 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
@@ -34,22 +35,22 @@
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
- private String glassType;
+ private Integer glassType;
/**
* 瀹�
*/
- 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;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -114,7 +125,7 @@
/**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
- private Integer angle;
+ private double angle;
/**
* 宸ョ▼鍙�
@@ -130,6 +141,10 @@
* 鐜荤拑ID
*/
private String glassId;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer combine;
}
--
Gitblit v1.8.0