From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 13:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponGetVo.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 e337748..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;
@@ -37,6 +38,7 @@
private Integer sendTimeType;
@ApiModelProperty(value="发送时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
@ApiModelProperty(value = "使用范围1.全场2.指定商品")
@@ -46,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 = "有效期")
@@ -74,4 +78,7 @@
@ApiModelProperty(value = "关联用户集合")
private List<MgtCouponMemberListVo> relUserList;
+
+ @ApiModelProperty(value = "宣传海报")
+ private String propagandaPoster;
}
--
Gitblit v1.7.1