From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期一, 02 九月 2024 20:18:52 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java |    7 +++++++
 1 files changed, 7 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..207a25d 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,10 @@
 
     @ApiModelProperty(value = "是否可质检退款")
     private boolean couldCheckRefund;
+
+    @ApiModelProperty(value = "支付单号")
+    private String paymentTrId;
+
+    @ApiModelProperty(value = "积分商品列表")
+    private List<OrderPointGoodsListDTO> pointGoodsList;
 }

--
Gitblit v1.9.3