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/SysProjServices.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index 46dd6a0..70cd5a4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -37,7 +37,7 @@
/**
* 订单创建时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date createTime;
/**
@@ -289,14 +289,14 @@
/**
* 扩展属性-预约查询开始时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 扩展属性-预约查询结束时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date closureTime;
--
Gitblit v1.9.1