Merge branch 'dev_compare_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud

Conflicts: epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
3 years ago · b809ff8d2f
1 changed files with 4 additions and 3 deletions
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
@ -38,12 +38,13 @@ public class NatUserInfoResultDTO implements Serializable {
     * ic_nat表ID
     */
    private String id;
-    
-    /** 
+
+    /**
     * 采样时间
     * @author wxz
     * @date 2022/11/9 上午12:22
-     * @param null 
+     * @param null
     */
    private Date sampleTime;
+
 }