From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +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/vo/MerCouponGetVo.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 bed7d05..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
@@ -1,5 +1,6 @@
package com.ruoyi.member.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
import io.swagger.annotations.ApiModelProperty;
@@ -28,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自定义")
@@ -38,18 +39,21 @@
private Integer sendTimeType;
@ApiModelProperty(value="发送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date sendTime;
@ApiModelProperty(value = "使用范围1.全场2.指定商品")
- private String useScope;
+ private Integer useScope;
@ApiModelProperty(value = "有效期类型1.时间段2.领取之日起")
private Integer validTimeType;
@ApiModelProperty(value = "有效开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date validStartTime;
@ApiModelProperty(value = "有效截止时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date validEndTime;
@ApiModelProperty(value = "有效期")
@@ -74,5 +78,12 @@
@ApiModelProperty(value = "关联用户集合")
private List<MgtCouponMemberListVo> relUserList;
+ @ApiModelProperty(value = "宣传海报")
+ private String propagandaPoster;
+ @ApiModelProperty(value = "发放限制数量")
+ private Integer sendLimitNumber;
+
+ @ApiModelProperty(value = "发放限制0否1是")
+ private Integer sendLimitFlag;
}
--
Gitblit v1.7.1