Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-07-06 a46a7458e10828dc45eb242d1eebfb92ff83f107

 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>ruoyi-extend</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>4.0.1</version>
        <version>4.2.0</version>
    </parent>
    <artifactId>ruoyi-xxl-job-admin</artifactId>
    <packaging>jar</packaging>