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
@ -46,4 +46,5 @@ public class NatUserInfoResultDTO implements Serializable {
     * @param null
     */
    private Date sampleTime;
 }