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

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-admin/pom.xml

@@ -41,10 +41,15 @@
            <artifactId>ruoyi-system</artifactId>
        </dependency>

        <!-- 定时任务-->
        <!-- 定时任务 @deprecated 3.4.0删除 迁移至xxl-job -->
<!--        <dependency>-->
<!--            <groupId>com.ruoyi</groupId>-->
<!--            <artifactId>ruoyi-quartz</artifactId>-->
<!--        </dependency>-->

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-quartz</artifactId>
            <artifactId>ruoyi-job</artifactId>
        </dependency>

        <dependency>