From 3c58510ca9d6d5178b924ac3afade5e9c745cac6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 20 Jan 2021 16:26:04 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java | 4 ++++
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 4 ++++
2 files changed, 8 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;
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index d8f00fe..c6975a2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -381,6 +381,10 @@
width="300">
</el-table-column>
<el-table-column
+ prop="createTime"
+ label="交易时间">
+ </el-table-column>
+ <el-table-column
prop="flowType"
label="交易类型">
</el-table-column>
--
Gitblit v1.9.1