|
@@ -110,17 +110,12 @@
|
|
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
|
<scope>test</scope>
|
|
<scope>test</scope>
|
|
|
</dependency>
|
|
</dependency>
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
<dependency>
|
|
<dependency>
|
|
|
<groupId>com.aliyun.oss</groupId>
|
|
<groupId>com.aliyun.oss</groupId>
|
|
|
<artifactId>aliyun-sdk-oss</artifactId>
|
|
<artifactId>aliyun-sdk-oss</artifactId>
|
|
|
<version>3.15.1</version> <!-- 使用最新稳定版本 -->
|
|
<version>3.15.1</version> <!-- 使用最新稳定版本 -->
|
|
|
</dependency>
|
|
</dependency>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-=======
|
|
|
|
|
->>>>>>> c8f9768 (1)
|
|
|
|
|
</dependencies>
|
|
</dependencies>
|
|
|
<dependencyManagement>
|
|
<dependencyManagement>
|
|
|
<dependencies>
|
|
<dependencies>
|
