fix 修复合并错误

疯狂的狮子Li

2021-09-17 9342bbef5659a43114193a725a96ad852eec7a79

 ruoyi-framework/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>

@@ -64,9 +64,9 @@
        <!-- 系统模块-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-system</artifactId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>

    </dependencies>

</project>
</project>