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

疯狂的狮子li

2021-12-22 b6442b4640fd94b812419263b03c9ce5e2371c9a

 ruoyi-demo/pom.xml

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