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

疯狂的狮子li

2022-02-21 ea7ea2ec59a50db2fec8228efc81a63afd8283de

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

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