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/enums/IcResiUserTableEnum.java

@@ -36,7 +36,9 @@ public enum IcResiUserTableEnum {
     IC_SZ("ic_resi_user","失智人员信息录入表", null, 2, "IS_SZ", false),
     IC_CJ("ic_resi_user","残疾人员信息录入表", null, 2, "IS_CJ", false),
     IC_DB("ic_resi_user","大病人员信息录入表", null, 2, "IS_DB", false),
-    IC_MB("ic_resi_user","慢病人员信息录入表", null, 2, "IS_MB", false);
+    IC_MB("ic_resi_user","慢病人员信息录入表", null, 2, "IS_MB", false),
+    IC_TENANT("ic_resi_user","租户信息录入表", null, 2, "IS_TENANT", false),
+    IC_FLOATING("ic_resi_user","流动人口信息录入表", null, 2, "IS_FLOATING", false);
 
     private String tableName;
     /**

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql

@@ -3,4 +3,8 @@ alter table ic_resi_member add COLUMN WORK_PLACE VARCHAR(128) comment '单位或
 
 -- 居民信息表添加租户列
 alter table ic_resi_user add column IS_TENANT char(1) comment '是否租户【是:1 否:0】' after IS_SPECIAL;
-update ic_resi_user set ic_resi_user.IS_TENANT='0' where ic_resi_user.IS_TENANT is null or ic_resi_user.IS_TENANT='';
+update ic_resi_user set ic_resi_user.IS_TENANT='0' where ic_resi_user.IS_TENANT is null or ic_resi_user.IS_TENANT='';
+
+-- 居民信息表添加流动人口列
+alter table ic_resi_user add column IS_FLOATING char(1) comment '是否是流动人口【是:1 否:0】' after IS_TENANT;
+update ic_resi_user set ic_resi_user.IS_FLOATING='0' where ic_resi_user.IS_FLOATING is null or ic_resi_user.IS_FLOATING='';