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

疯狂的狮子li

2021-11-29 bf98ee3c936130bf4df4b2eda1240f61cf380ac3

 ruoyi-framework/pom.xml

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