From 691eb8477b0a2b8d6f8e94788187b7b470374d86 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 18 二月 2025 14:49:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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..ce530ac 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,15 +66,23 @@
/**
* 灏忕墖瀹斤紙鍔犵（閲忥級
*/
- private Double pWidth;
+ private double pWidth;
/**
* 灏忕墖楂橈紙鍔犵（閲忥級
*/
- private Double pHeight;
+ private double pHeight;
/**
- * 鐗堝浘id
+ * 鍘熺墖鐗堝浘id
*/
private Integer stockId;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer xAxis;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer yAxis;
/**
* 閽㈠寲鐗堝浘缂栧彿(鏋跺彿)
*/
@@ -86,11 +94,11 @@
/**
* x鍧愭爣
*/
- private Integer xAxis;
+ private Integer xAxisHeat;
/**
* y鍧愭爣
*/
- private Integer yAxis;
+ private Integer yAxisHeat;
/**
* 宸ョ▼鍙�
*/
@@ -102,10 +110,17 @@
/**
* 璁㈠崟搴忓彿
*/
- private String orderSort;
+ private Integer orderSort;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer combine;
/**
* 鏃嬭浆瑙掑害
*/
- private Double rotateAngle;
-
+ private double rotateAngle;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0