From ebbe59b6ee3378fa296441cabe8bb81b2bc200b5 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 26 Apr 2021 13:47:22 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java index dfc5c00..661707f 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java @@ -1,9 +1,10 @@ package com.matrix.system.activity.vo; -import java.util.Date; - +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.Date; @Data public class SignReceiveListVo { @@ -16,15 +17,26 @@ private String nickName; @ApiModelProperty(value = "签到时间") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date reciveTime; @ApiModelProperty(value = "连续签到天数") private Integer cumulativeDay; + + @ApiModelProperty(value = "数量") + private Integer scoreCnt; @ApiModelProperty(value = "奖励类型") private String awardType; @ApiModelProperty(value = "获得奖励") private String awardName; + @ApiModelProperty(value = "优惠券名") + private String couponName; + + @ApiModelProperty(value ="奖项规则(1:每日奖励(默认)2:累计签到天数)") + private int awardRule; + @ApiModelProperty(value ="是否已领取(1:待领取2:已领取)") + private int state; } -- Gitblit v1.9.1