From cc9d558c8cda42d53be7b4545d2f33db26edf777 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Thu, 28 May 2020 16:46:18 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
index c106062..db8e91f 100644
--- a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
@@ -37,7 +37,7 @@
 	@ApiModelProperty(value = "剩余时间")
     private Long timeLeft;
 	@ApiModelProperty(value = "下单时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@JsonFormat(pattern = "MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 	@ApiModelProperty(value = "平台收款方式")
 	private List<PlatformPaymentMethodEntity> platforPaymentMethodList;

--
Gitblit v1.9.1