Merge remote-tracking branch 'origin/master'

huanghongfa

2021-08-13 2e6ae80c0271e5e45faa399ce94cd44678cce43f

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

@@ -131,7 +131,6 @@
                        vo.setSerialNumber(oneData.get(0));
                    }
                    //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
                    if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
                        if(StringUtils.isEmpty(oneData.get(1))){
                            ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
                            index++;
@@ -178,7 +177,7 @@
                        }else{
                            vo.setSex(PopulSexEnum.nv.getCode());
                        }
                    }

                    if(StringUtils.isNotEmpty(oneData.get(3))){
                        vo.setNation(oneData.get(3));
                    }