From 48ba3ae33264d3baf0db1f1685243553e25294c7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 18:04:50 +0800
Subject: [PATCH] 20210420 签到

---
 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