Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 10f6e465c9753ff99099a22aabe72ede4e25eab7

 ruoyi-admin/pom.xml

@@ -17,11 +17,6 @@

    <dependencies>
        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.8.0</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>31.1-jre</version> <!-- 请根据需要选择合适的版本 -->