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/AppMemberCouponPageVo.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
index dd34bd1..64b383a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
@@ -1,9 +1,11 @@
package com.ruoyi.member.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -44,6 +46,21 @@
private BigDecimal discountPercent;
+ @ApiModelProperty(value = "有效开始时间")
+ @JsonFormat(pattern = "yyyy.MM.dd")
+ private Date validStartTime;
+ @ApiModelProperty(value = "有效结束时间")
+ @JsonFormat(pattern = "yyyy.MM.dd")
+ private Date deadlineTime;
+ @ApiModelProperty(value = "使用时间")
+ @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss")
+ private Date useTime;
+
+ @ApiModelProperty(value = "核销店铺")
+ private String verifyShopName;
+
+ @ApiModelProperty(value = "核销码")
+ private String verifyCode;
}
--
Gitblit v1.7.1