From be646da6a960105511e719e39deb9c52b3ff2b83 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 10:03:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 4 ++++
1 files changed, 4 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 8f9210e..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 {
@@ -135,4 +136,7 @@
@ApiModelProperty(value = "支付单号")
private String paymentTrId;
+
+ @ApiModelProperty(value = "积分商品列表")
+ private List<OrderPointGoodsListDTO> pointGoodsList;
}
--
Gitblit v1.9.3