From aa6ffcaae173e0ba6372c90261b8a7d4b1fd6052 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:07:17 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerVerifyCouponGetVo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 3acf9e2..5ce967a 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
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,11 +17,19 @@
@Data
public class MerVerifyCouponGetVo {
+ @ApiModelProperty(value = "优惠券id")
+ private String memberCouponId;
@ApiModelProperty(value = "用户id")
private Long userId;
+ @ApiModelProperty(value = "优惠券来源")
+ private String couponFrom;
+
@ApiModelProperty(value = "商品列表")
private List<Goods> goodsList;
+ @ApiModelProperty(value = "优惠券")
+ private MemberCoupon memberCoupon;
+
}
--
Gitblit v1.7.1