Merge branch 'test' into 'master'

罗元桥

2021-07-16 151bfa7ab112a0675f4ca48cc414f4398b30cd0d

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

@@ -434,6 +434,8 @@
            }else{
                if(!populationImportErrorVOList.isEmpty()){
                    throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
                }else {
                    R r1 = communityService.listSavePopulationConfirm(newVoList, communityId);
                }
            }
        } catch (NumberFormatException e) {