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

疯狂的狮子li

2020-10-10 bd39b971cf9fbecdc3086f4ef75a37291b98505d

 ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
    <parent>

        <artifactId>ruoyi</artifactId>

        <groupId>com.ruoyi</groupId>

        <version>3.1.0</version>

        <version>3.2.0</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>