From 3744ee1fd763d7414a38f515ba13224866b924aa Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 03 九月 2024 12:30:34 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index c83bc33..d7d5958 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -25,28 +25,28 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 瀹�
*/
- private Double oHeight;
+ private double oHeight;
/**
* 楂�
*/
- private Double oWidth;
+ private double oWidth;
/**
* 鍘氬害
*/
- private Double glassThickness;
+ private double glassThickness;
/**
* 鐜荤拑鑶滅郴
@@ -66,11 +66,11 @@
/**
* 灏忕墖瀹斤紙鍔犵（閲忥級
*/
- private Double pWidth;
+ private double pWidth;
/**
* 灏忕墖楂橈紙鍔犵（閲忥級
*/
- private Double pHeight;
+ private double pHeight;
/**
* 鐗堝浘id
*/
@@ -102,10 +102,14 @@
/**
* 璁㈠崟搴忓彿
*/
- private String orderSort;
+ private Integer orderSort;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer merge;
/**
* 鏃嬭浆瑙掑害
*/
- private Double rotateAngle;
+ private double rotateAngle;
}
--
Gitblit v1.8.0