From 8e20669c2cd6fee22117d49459e6ae0693ba181d Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 6 Apr 2022 14:55:40 +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

---
 .../src/main/java/com/epmet/dto/result/MyNatListResultDTO.java  | 2 +-
 .../epmet-user-server/src/main/resources/mapper/IcNatDao.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 c05f7fff2c..355d52d213 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
@@ -71,6 +71,6 @@ public class MyNatListResultDTO implements Serializable {
      * 检测时间,yyyy-MM-dd HH:mm
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date createdTime;
+    private Date reportTime;
 
 }
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 3d24bec4bd..5c4ad0b6e7 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
@@ -16,7 +16,7 @@
             nat_address natAddress,
             file_name fileName,
             attachment_url attachmentUrl,
-            created_time createdTime
+            created_time reportTime
         FROM
             ic_nat
         WHERE