From 143acd2312a766f39c75b82bce5a32412b863825 Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop

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

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java
index 1bf2d2f..5358c7a 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java
@@ -16,7 +16,7 @@
 	 * 核销时间
 	 */
 	@ApiModelProperty(value ="核销时间")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date  writeoffTime;
 	
 	/**
@@ -47,7 +47,7 @@
 	 * 中奖时间
 	 */
 	@ApiModelProperty(value ="中奖时间")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date  winTime;
 	
 	/**

--
Gitblit v1.9.1