From a71099c9e86627bfe1ab07e8f52ef44654f4e5bb Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 28 Dec 2020 11:41:36 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java index 58007a1..8a26083 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java @@ -1,6 +1,9 @@ package com.matrix.system.app.vo; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.matrix.core.tools.DateUtil; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; import java.util.Date; @@ -12,16 +15,20 @@ @ApiModel(value = "VipCardListVo", description = "会员卡项列表") public class VipCardListVo { + @ApiModelProperty(value = "卡项名称") private String cardName; - private String vipNo; - + @ApiModelProperty(value = "现有金额") private BigDecimal realMoney; + @ApiModelProperty(value = "赠送金额") private BigDecimal giftMoney; + @ApiModelProperty(value = "状态 1-有效 2-无效") private String status; + @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8") + @ApiModelProperty(value = "有效时间") private Date failTime; public String getCardName() { @@ -30,14 +37,6 @@ public void setCardName(String cardName) { this.cardName = cardName; - } - - public String getVipNo() { - return vipNo; - } - - public void setVipNo(String vipNo) { - this.vipNo = vipNo; } public BigDecimal getRealMoney() { -- Gitblit v1.9.1