From 78a1ef9e6829ac1020c41bd20b858065eb07710c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 28 六月 2024 08:21:59 +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, 29 insertions(+), 0 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 622197a..c83bc33 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
@@ -33,6 +33,17 @@
     private Double height;
 
     /**
+     * 瀹�
+     */
+    private Double oHeight;
+
+    /**
+     * 楂�
+     */
+    private Double oWidth;
+
+
+    /**
      * 鍘氬害
      */
     private Double glassThickness;
@@ -41,6 +52,16 @@
      * 鐜荤拑鑶滅郴
      */
     private String glassType;
+
+    /**
+     * 灞傛暟
+     */
+    private int layer;
+
+    /**
+     * 鎬诲眰鏁�
+     */
+    private int totalLayer;
 
     /**
      * 灏忕墖瀹斤紙鍔犵(閲忥級
@@ -78,5 +99,13 @@
      * 灏忕墖缂栧彿
      */
     private  String glassId;
+    /**
+     * 璁㈠崟搴忓彿
+     */
+    private  String orderSort;
+    /**
+     * 鏃嬭浆瑙掑害
+     */
+    private  Double rotateAngle;
 
 }

--
Gitblit v1.8.0