From 38ab27c64d593d7b69a0d60eeafde32a9f14395e Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Mon, 09 Aug 2021 13:51:25 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
index af7d6a6..9dea112 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java
@@ -39,7 +39,7 @@
 	private int  state;
 	
 	@ApiModelProperty(value ="兑奖时间")
-	@JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date  djsj;
 	
 	@ApiModelProperty(value ="收货人")

--
Gitblit v1.9.1