From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
index 1ec5b71..6fdca44 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java
@@ -17,14 +17,19 @@
@Data
public class MerVerifyCouponGetVo {
+ @ApiModelProperty(value = "优惠券id")
+ private Long memberCouponId;
@ApiModelProperty(value = "用户id")
private Long userId;
- @ApiModelProperty(value = "优惠券")
- private MemberCoupon memberCoupon;
+ @ApiModelProperty(value = "优惠券来源")
+ private String couponFrom;
@ApiModelProperty(value = "商品列表")
private List<Goods> goodsList;
+ @ApiModelProperty(value = "优惠券")
+ private MemberCoupon memberCoupon;
+
}
--
Gitblit v1.7.1