From c7093edbf1fb3c91107c457ea13935305e1a9458 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 05 七月 2024 14:58:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 19cb029..54e844b 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,17 +25,28 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
+
+ /**
+ * 瀹�
+ */
+ private double oHeight;
+
+ /**
+ * 楂�
+ */
+ private double oWidth;
+
/**
* 鍘氬害
*/
- private Double glassThickness;
+ private double glassThickness;
/**
* 鐜荤拑鑶滅郴
@@ -55,11 +66,11 @@
/**
* 灏忕墖瀹斤紙鍔犵（閲忥級
*/
- private Double pWidth;
+ private double pWidth;
/**
* 灏忕墖楂橈紙鍔犵（閲忥級
*/
- private Double pHeight;
+ private double pHeight;
/**
* 鐗堝浘id
*/
@@ -88,5 +99,13 @@
* 灏忕墖缂栧彿
*/
private String glassId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private Integer orderSort;
+ /**
+ * 鏃嬭浆瑙掑害
+ */
+ private double rotateAngle;
}
--
Gitblit v1.8.0