From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
index 351becf..b9d40b2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
@@ -29,7 +29,7 @@
@ApiModelProperty(value="优惠券名称")
private String couponName;
- @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
+ @ApiModelProperty(value = "发送类型1.手动领取2.指定发放3.抽奖领取")
private Integer sendType;
@ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")
@@ -80,4 +80,10 @@
@ApiModelProperty(value = "宣传海报")
private String propagandaPoster;
+
+ @ApiModelProperty(value = "发放限制数量")
+ private Integer sendLimitNumber;
+
+ @ApiModelProperty(value = "发放限制0否1是")
+ private Integer sendLimitFlag;
}
--
Gitblit v1.7.1