From 4dfe83675fc23f4514b6c3cf44fcc84c7e0b52a8 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 21 Apr 2021 10:03:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 4 +++- 1 files changed, 3 insertions(+), 1 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 e3ae3d1..42540cf 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 @@ -17,7 +17,7 @@ private String nickName; @ApiModelProperty(value = "签到时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date reciveTime; @ApiModelProperty(value = "连续签到天数") @@ -31,5 +31,7 @@ @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）") private int awardRule; + @ApiModelProperty(value ="是否已领取（1：待领取2:已领取）") + private int state; } -- Gitblit v1.9.1