From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
index f1f14bd..32b9b99 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -40,4 +41,7 @@
     private List<OrderItemLocationListDTO> items;
 
     private String createBy;
+
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal totalAmount;
 }

--
Gitblit v1.9.3