From 3124ce87407fe85f6780b3ba1a219d8d9e8d7475 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十月 2025 13:21:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java
index 7a3f2de..dcb008e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java
@@ -1,13 +1,9 @@
 package com.mes.order.entity.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -41,12 +37,12 @@
     /**
      * 璁㈠崟鏁伴噺
      */
-    private String quantity;
+    private Integer quantity;
 
     /**
      * 璁㈠崟闈㈢Н
      */
-    private String area;
+    private Double area;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -56,7 +52,12 @@
     /**
      * 璁㈠崟杩涘害鐧惧垎姣�
      */
-    private String percent;
+    private Double percent;
+
+    /**
+     * 璁㈠崟鐘舵��
+     */
+    private Integer orderStatus;
 
 
 }

--
Gitblit v1.8.0