From 230b3fa47664a1a437cfb8cced69ff01ee6f70c9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 10 May 2022 13:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8E=9F=E5=9B=A0=E5=8F=98=E6=9B=B4=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=B6=E9=97=B4=E4=B8=BAcreatedTi?=
 =?UTF-8?q?me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcUserChangeRecordDTO.java     | 11 ++++++++---
 .../main/resources/mapper/IcUserChangeRecordDao.xml   |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
index d1a60deeff..10b926ba35 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeRecordDTO.java
@@ -17,9 +17,11 @@
 
 package com.epmet.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -89,8 +91,9 @@ public class IcUserChangeRecordDTO implements Serializable {
 	private String afterChangeName;
 
     /**
-     * 调整时间
+     * 变更时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	private Date changeTime;
 
     /**
@@ -119,8 +122,10 @@ public class IcUserChangeRecordDTO implements Serializable {
 	private String createdBy;
 
     /**
-     * 创建时间
+     * 创建时间 
+     * 调整时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	private Date createdTime;
 
     /**
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
index 630482715d..cd04e8ddfa 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcUserChangeRecordDao.xml
@@ -18,7 +18,8 @@
             after_change_name,
             change_time,
             remark,
-            REASON
+            REASON,
+            CREATED_TIME
         FROM
             ic_user_change_record
         WHERE