Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-09-17 2b53e9d86a358dcf2553e810cab46cba4aee161e

 ruoyi-demo/pom.xml

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