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

疯狂的狮子li

2022-07-06 a46a7458e10828dc45eb242d1eebfb92ff83f107

 ruoyi-job/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>3.4.0</version>
        <version>4.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>