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

疯狂的狮子li

2021-10-26 61375c4bbbcc2966f49c367b39a96f0157578b95

 ruoyi-admin/pom.xml

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

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