From aac77d7ee28cc59aebce251b3c52243e3df6f003 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 19 八月 2024 15:18:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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 372dc35..01258d3 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,22 +35,24 @@
     /**
      * 瀹�
      */
-    private double width;
+    private String width;
     /**
      * 楂�
      */
-    private double height;
+    private String height;
 
     /**
      * 闈㈢Н
      */
     private double area;
+
+
     /**
-     * 鏁伴噺
+     * 鍖呰鏂瑰紡
      */
     private Integer quantity;
     /**
-     * 鍔犲伐鏂瑰紡
+     * 鐘舵��
      */
     private String processingNote;
     /**

--
Gitblit v1.8.0