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

疯狂的狮子li

2021-07-27 51ae60820da95805287e9a4448f7cc35888a8957

 ruoyi-system/pom.xml

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