From dbff53150cdc807faa56c0d1a947d24b69f372b9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 31 八月 2023 18:43:20 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java
index 40822ce..8a9b600 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java
@@ -1,5 +1,6 @@
package com.ruoyi.member.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,19 +22,23 @@
@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.全部用户3.会员用户4非会员用户5自定义")
+ @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
private Integer sendType;
- @ApiModelProperty("发送时间类型1立即2定时")
+ @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")
+ private Integer sendTarget;
+
+ @ApiModelProperty(value="发送时间类型1立即2定时")
private Integer sendTimeType;
- @ApiModelProperty("发送时间")
+ @ApiModelProperty(value="发送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
@ApiModelProperty(value = "使用范围1.全场2.指定商品")
@@ -43,9 +48,11 @@
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 = "有效期")
@@ -71,4 +78,7 @@
@ApiModelProperty(value = "关联用户集合")
private List<MgtCouponMemberListVo> relUserList;
+
+ @ApiModelProperty(value = "宣传海报")
+ private String propagandaPoster;
}
--
Gitblit v1.7.1