From 55301b09ac1e68bdd081683c4dea9426ecd70460 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 15:31:15 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 11 +++++++++--
1 files changed, 9 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..d43dbf6 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,6 +17,7 @@
private String nickName;
@ApiModelProperty(value = "签到时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
private Date reciveTime;
@ApiModelProperty(value = "连续签到天数")
@@ -26,5 +28,10 @@
@ApiModelProperty(value = "获得奖励")
private String awardName;
+
+ @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）")
+ private int awardRule;
+ @ApiModelProperty(value ="是否已领取（1：待领取2:已领取）")
+ private int state;
}
--
Gitblit v1.9.1