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

manailin

2021-09-30 438e0309b09a70224d6e5be0d60ac5b52aa6df48

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java

@@ -223,7 +223,7 @@
            }

            //判断民族是否存在
            if(!isOnly(memberExcel.getNation(),nationMap)){
            if(isOnly(memberExcel.getNation(),nationMap)){
                ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
                BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
                memberExcelErrorVO.setError("您填写的民族不存在");