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

疯狂的狮子li

2021-07-27 06944747fd52b98f21337274678325ff62d10beb

 ruoyi-system/pom.xml

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