Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-12-28 948ad860498cc6c482ee492611b3394f7e661741

 ruoyi-oss/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.2</version>
        <version>3.5.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -21,10 +21,6 @@
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-system</artifactId>
        </dependency>

        <dependency>