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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

 ruoyi-extend/pom.xml

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

    <modules>
        <module>ruoyi-monitor-admin</module>
        <module>ruoyi-xxl-job-admin</module>
    </modules>

</project>