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

huanghongfa

2021-05-20 ad0241fd6fe15600dde313cb28c9861be6c8089c

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

@@ -204,6 +204,9 @@
            if (comCvtServeDOS.size()>0 && errorInfo != null && errorInfo.size() > 0) {
                return R.fail("导入部分成功：" + errorInfo.toString());
            }
            if(comCvtServeDOS.size()==0  && errorInfo != null && errorInfo.size() > 0){
                return R.fail("导入失败：" + errorInfo.toString());
            }
        }
        return R.ok("共计导入服务数量："+comCvtServeDOS.size());
    }