Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-26 4da8d6c1e9d37606f15dca9fb552890724db4628

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java

@@ -168,6 +168,8 @@
                        continue;
                    }
                    vo.setIsRent(isOk);
                }else {
                    vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
                }
                if(StringUtils.isNotEmpty(oneData.get(5))){

@@ -341,7 +343,7 @@
                        }
                        vo.setOutOrLocal(isOk);
                }else {
                    vo.setOutOrLocal(1);
                    vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
                }
                if(StringUtils.isNotEmpty(oneData.get(26))){
                    vo.setCensusRegister(oneData.get(26).trim());