Merge branch 'dev_epidemic_situation' into develop

3 years ago · 7500eb04df
2 changed files with 2 additions and 2 deletions
--- 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;
 }
--- 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