From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 十二月 2024 11:52:07 +0800
Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
index 24c9cbc..36b99e9 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -15,8 +16,12 @@
private String partnerName;//合伙人名称
+ private Long warehouseId;//仓库id
+
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
+
+ private Long warehouseLocationId;//库位id
@ApiModelProperty(value = "库位名称")
private String warehouseLocationCode;
@@ -49,4 +54,6 @@
private List<OrderItemListDTO> items;
private String createBy;
+
+ private BigDecimal totalAmount;//订单金额
}
--
Gitblit v1.9.3