From de363dc9abbc7b1bf72cca19861497a99108f304 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 18 Dec 2020 00:05:35 +0800
Subject: [PATCH] modify vip_detail.html

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index 6b46164..d1a33cf 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -31,13 +31,14 @@
 	/**
 	 * 下单时间
 	 */
+	@JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date orderTime;
 
 	/**
 	 * 收款
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM-8")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date payTime;
 

--
Gitblit v1.9.1