From 13060b4204c022eb7393a4917966ef7d592ef7a5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 24 六月 2024 21:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |   19 +++++++++++++++++++
 1 files changed, 19 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 19cb029..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;
@@ -88,5 +99,13 @@
      * 灏忕墖缂栧彿
      */
     private  String glassId;
+    /**
+     * 璁㈠崟搴忓彿
+     */
+    private  String orderSort;
+    /**
+     * 鏃嬭浆瑙掑害
+     */
+    private  Double rotateAngle;
 
 }

--
Gitblit v1.8.0