From 844e37605b65a2a3d95b466d663d91ac8584350c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 21:28:17 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into api

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |    2 --
 1 files changed, 0 insertions(+), 2 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 d1a33cf..663fa32 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,14 +31,12 @@
 	/**
 	 * 下单时间
 	 */
-	@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")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date payTime;
 

--
Gitblit v1.9.1