Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

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

@@ -333,7 +333,7 @@
                    vo.setHouseHold(oneData.get(27).trim());
                }
                if(StringUtils.isEmpty(oneData.get(28))){
                    vo.setHouseHold(oneData.get(28).trim());
                    vo.setIsResidence(0);
                }else{
                    vo.setIsResidence(PopulIsOkEnum.getCodeByName(oneData.get(28).trim()));
                }