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

CeDo

2021-05-20 9000db73310ad0f445e649b256e1ddde68c8df10

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

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