From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
index 37d6221..8c8cc65 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
@@ -1,5 +1,8 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -26,6 +29,7 @@
private String createBy;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT-8")
private Date createTime;
private String updateBy;
--
Gitblit v1.9.1