From 750ebf0d06cb95a42aa924ff211dfe6cde7d685e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 6 Apr 2022 14:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/MyNatListResultDTO.java  | 6 ++++++
 .../src/main/resources/mapper/IcNatDao.xml                  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
index feb97d97f5..c05f7fff2c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyNatListResultDTO.java
@@ -67,4 +67,10 @@ public class MyNatListResultDTO implements Serializable {
      */
     private String attachmentUrl;
 
+    /**
+     * 检测时间,yyyy-MM-dd HH:mm
+     */
+    @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/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
index 8392bf5856..3d24bec4bd 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@@ -15,7 +15,8 @@
             nat_result natResult,
             nat_address natAddress,
             file_name fileName,
-            attachment_url attachmentUrl
+            attachment_url attachmentUrl,
+            created_time createdTime
         FROM
             ic_nat
         WHERE