From a3cddf45e9c7c590e8fe034e951189c49548f29f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Apr 2021 16:58:56 +0800
Subject: [PATCH] 20210421 签到

---
 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 d43dbf6..06f33bf 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 = "连续签到天数")
@@ -28,6 +28,8 @@
 	
 	@ApiModelProperty(value = "获得奖励")
 	private String awardName;
+	@ApiModelProperty(value = "优惠券名")
+	private String couponName;
 	
 	@ApiModelProperty(value ="奖项规则(1:每日奖励(默认)2:累计签到天数)")
 	private int  awardRule;

--
Gitblit v1.9.1