From 92a4c3c35747bf1a043c2ff85650012d4eac9355 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 10:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java |    6 ++++++
 1 files changed, 6 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 1c3fae6..fb43104 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
@@ -9,6 +9,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class OrderDTO extends AbstractTransDTO {
@@ -132,4 +133,9 @@
 
     @ApiModelProperty(value = "是否可质检退款")
     private boolean couldCheckRefund;
+
+    @ApiModelProperty(value = "支付单号")
+    private String paymentTrId;
+
+    private List<OrderItemListDTO> items;
 }

--
Gitblit v1.9.3