Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-19 c380b776178ad0e51f6ed183302fe71af76c1059

 pom.xml

@@ -40,7 +40,7 @@
        <qiniu.version>7.8.0</qiniu.version>
        <aliyun.oss.version>3.13.0</aliyun.oss.version>
        <qcloud.cos.version>5.6.47</qcloud.cos.version>
        <minio.version>8.3.0</minio.version>
        <minio.version>8.2.0</minio.version>

        <!-- docker 配置 -->
        <docker.registry.url>localhost</docker.registry.url>