From 07fa8e744d9ed8dce280a4ca6851fe50d27ff4bd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 13 八月 2024 14:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
index 01258d3..372dc35 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -35,24 +35,22 @@
     /**
      * 瀹�
      */
-    private String width;
+    private double width;
     /**
      * 楂�
      */
-    private String height;
+    private double height;
 
     /**
      * 闈㈢Н
      */
     private double area;
-
-
     /**
-     * 鍖呰鏂瑰紡
+     * 鏁伴噺
      */
     private Integer quantity;
     /**
-     * 鐘舵��
+     * 鍔犲伐鏂瑰紡
      */
     private String processingNote;
     /**

--
Gitblit v1.8.0