Merge remote-tracking branch 'shucheng/mk'

# Conflicts: # blade-service-api/blade-open-api/src/main/java/org/springblade/openapi/mk/api/IApi4MK.java # blade-service-api/pom.xml # blade-service/blade-file/src/main/java/org/springblade/file/FileApplication.java # blade-service/blade-file/src/main/resources/bootstrap.yml # blade-service/blade-openapi/src/main/java/org/springblade/openapi/OpenApiApplication.java # blade-service/blade-openapi/src/main/resources/bootstrap.yml # pom.xml
2026-08-15 12:16:05 +08:00
parent 1ca36ae153 4de1d35c2c
commit 98cd7ba4cf
77 changed files with 5134 additions and 207 deletions
@@ -83,11 +83,11 @@
            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
        </dependency>-->
        <!--Taobao-Sdk-->
-        <dependency>
+<!--        <dependency>
            <groupId>com.taobao</groupId>
            <artifactId>taobao-sdk</artifactId>
            <version>20201116</version>
-        </dependency>
+        </dependency>-->
    </dependencies>

    <build>