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/CouponVo.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
index 47ee4c1..39b64fa 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java
@@ -1,9 +1,10 @@
 package com.matrix.system.activity.vo;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 @Data
 public class CouponVo {
@@ -23,7 +24,7 @@
 	 * 结束时间
 	 */
 	@ApiModelProperty(value = "结束时间")
-	@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+	@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
 	private Date  endTime;
 
 }

--
Gitblit v1.9.1