1.代码合并2

blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/OssClient.java

@@ -6,7 +6,7 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.sms.model.SmsResponse;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
-import org.springblade.resource.builder.oss.OssBuilder;
+import org.springblade.resource.builder.OssBuilder;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestPart;

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -151,6 +151,6 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 
 	@Override
 	public List<Tenant> selectTenantpageown() {
-		return null;
+		return baseMapper.selectTenantpageown();
 	}
 }