From 1cfbbe629377a6147d3415d38be3c0401e586669 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 08 Jan 2021 18:10:44 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
index 172951c..dcc8ff6 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
@@ -55,7 +55,7 @@
@ApiModelProperty(value = "欠款")
private BigDecimal arrears;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
@ApiModelProperty(value = "下单时间")
private Date orderTime;
--
Gitblit v1.9.1