From 17b569ed8554e755c9e5feedf6e7882cdf2c8d01 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Apr 2021 16:48:27 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
index d495ab8..da384ac 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/vo/ActivityMainDetailVo.java
@@ -32,10 +32,10 @@
private String content;
@ApiModelProperty("活动状态1:开始2结束")
private Integer state;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("开始时间")
private Date startTime;
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+8")
@ApiModelProperty("结束时间")
private Date endTime;
/**
--
Gitblit v1.9.1