From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 05 九月 2024 17:16:16 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java
index 884f18f..c338f50 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderCommitDTO.java
@@ -26,4 +26,10 @@
 
     @NotBlank(message = "微信code不能为空")
     private String wxcode;
+
+    @ApiModelProperty(value = "用户优惠券id")
+    private String couponRecordId;
+
+    @ApiModelProperty(value = "用户积分商品兑换券id列表")
+    private List<Long> goodsRecordIdList;
 }

--
Gitblit v1.9.3