fjj

pom.xml

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