From 5fad5b026148771b103a6eed0e46dfcad3ee24a0 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 25 十一月 2024 18:38:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
index b55429c..f48ea43 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
@@ -39,4 +39,6 @@
 	private UserAddress userAddress;
 	@ApiModelProperty("支付方式(1=现金,2=积分)")
 	private Integer paymentType;
+	@ApiModelProperty("优惠券列表")
+	private List<CouponInfoVo> coupon;
 }

--
Gitblit v1.7.1