Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 b84fc1807a6ce71f4d10cdb10da186abc5dcc173

 pom.xml

@@ -30,6 +30,7 @@
        <poi.version>4.1.2</poi.version>
        <velocity.version>2.3</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <aliyun-oss.version>3.17.4</aliyun-oss.version>
    </properties>

    <!-- 依赖声明 -->
@@ -156,6 +157,12 @@
                <version>${ruoyi.version}</version>
            </dependency>

            <!--阿里云oss-->
            <dependency>
                <groupId>com.aliyun.oss</groupId>
                <artifactId>aliyun-sdk-oss</artifactId>
                <version>${aliyun-oss.version}</version>
            </dependency>
        </dependencies>
    </dependencyManagement>