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

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -458,6 +458,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     columnAndValues.put("IS_CJ", "0");
                     columnAndValues.put("IS_DB", "0");
                     columnAndValues.put("IS_MB", "0");
+                    columnAndValues.put("IS_TENANT", "0");
+                    columnAndValues.put("IS_FLOATING", "0");
                 } else {
                     // 该居民已存在，要做更新操作，因为还没有读取子sheet，所以这些居民最新类别没有办法获取，先设置上旧的数据
                     columnAndValues.put("IS_ENSURE_HOUSE", existingResiMap.get("IS_ENSURE_HOUSE"));
@@ -478,6 +480,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     columnAndValues.put("IS_CJ", existingResiMap.get("IS_CJ"));
                     columnAndValues.put("IS_DB", existingResiMap.get("IS_DB"));
                     columnAndValues.put("IS_MB", existingResiMap.get("IS_MB"));
+                    columnAndValues.put("IS_TENANT", existingResiMap.get("IS_TENANT"));
+                    columnAndValues.put("IS_FLOATING", existingResiMap.get("IS_FLOATING"));
                 }
 
                 columnAndValues.put("AGENCY_ID", currUserAgencyId);