From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

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

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java
index 0ff34af..822e56e 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java
@@ -66,7 +66,7 @@
 	 * 开始时间
 	 */
 	@ApiModelProperty(value = "开始时间")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date actBeginTime;
 			
 	
@@ -74,7 +74,7 @@
 	 * 结束时间
 	 */
 	@ApiModelProperty(value = "结束时间")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date  actEndTime;
 	/**
 	 * 活动状态

--
Gitblit v1.9.1