From af77899d830e854d01b48bc12db04b02116e5ea4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 26 九月 2024 16:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java |    3 +++
 1 files changed, 3 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 2ba18f0..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
@@ -53,4 +54,6 @@
     private List<OrderItemListDTO> items;
 
     private String createBy;
+
+    private BigDecimal totalAmount;//订单金额
 }

--
Gitblit v1.9.3