# Conflicts: # blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java # blade-ops/blade-resource/src/main/resources/application.yml # blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java