From 8f7b99b0a3d53f4410e8b1f2f209ce2743f0a944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Apr 2021 20:14:44 +0800
Subject: [PATCH] 20210408 核销

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java |    9 +++++++--
 1 files changed, 7 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..e3ae3d1 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,8 @@
 	
 	@ApiModelProperty(value = "获得奖励")
 	private String awardName;
+	
+	@ApiModelProperty(value ="奖项规则(1:每日奖励(默认)2:累计签到天数)")
+	private int  awardRule;
 
 }

--
Gitblit v1.9.1