From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/dto/OrderDTO.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..6f7b4ca 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,12 +42,12 @@
/**
* 璁㈠崟鏁伴噺
*/
- private String quantity;
+ private Integer quantity;
/**
* 璁㈠崟闈㈢Н
*/
- private String area;
+ private Double area;
/**
* 鍒涘缓鏃堕棿
@@ -56,7 +57,12 @@
/**
* 璁㈠崟杩涘害鐧惧垎姣�
*/
- private String percent;
+ private Double percent;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ private Integer orderStatus;
}
--
Gitblit v1.8.0