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

4 years ago · c561d7474a
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@ -73,7 +73,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
    /**
     * 导入的居民中，新增或者变动的居民
     */
-    public static final ThreadLocal<ResiImportResiCategoryChangedCache> newlyChangedResi = new ThreadLocal<>();
+    public static final ThreadLocal<ResiImportResiCategoryChangedCache> newlyOrChangedResi = new ThreadLocal<>();

    /**
     * 居民类别items列表。<columnName,label>