From 55db77e61e5a55c30dc19d599dadcfc1469c962e Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

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

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
index 5b64837..7ae63c5 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
@@ -162,4 +162,6 @@
 
     @ApiModelProperty(value = "优惠金额(每扎)")
     private BigDecimal memberDiscountAmount;
+
+    private List<OrderItemListDTO> items;
 }

--
Gitblit v1.9.3