From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponEditDto.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponEditDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponEditDto.java
index aaa268f..ed1df99 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponEditDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerCouponEditDto.java
@@ -21,22 +21,22 @@
@ApiModelProperty(value = "优惠券id 新增不传")
private String couponId;
- @ApiModelProperty("优惠券类型1.满减2.折扣3.代金4.商品")
+ @ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品")
private Integer couponType;
- @ApiModelProperty("优惠券名称")
+ @ApiModelProperty(value="优惠券名称")
private String couponName;
- @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
+ @ApiModelProperty(value = "发送类型1.手动领取2.指定发放3.抽奖领取")
private Integer sendType;
@ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")
private Integer sendTarget;
- @ApiModelProperty("发送时间类型1立即2定时")
+ @ApiModelProperty(value="发送时间类型1立即2定时")
private Integer sendTimeType;
- @ApiModelProperty("发送时间")
+ @ApiModelProperty(value="发送时间")
private Date sendTime;
@ApiModelProperty(value = "使用范围1.全场2.指定商品")
@@ -73,6 +73,13 @@
@ApiModelProperty(value = "关联用户id集合")
private List<Long> relUserIdList;
+ @ApiModelProperty(value = "宣传海报")
+ private String propagandaPoster;
+ @ApiModelProperty(value = "发放限制数量")
+ private Integer sendLimitNumber;
+
+ @ApiModelProperty(value = "发放限制0否1是")
+ private Integer sendLimitFlag;
}
--
Gitblit v1.7.1