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

疯狂的狮子li

2021-07-29 2ef70303c5f1808afd3507ee934b3f32df8e9b3c

 ruoyi-extend/ruoyi-monitor-admin/pom.xml

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-extend</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>2.5.0</version>
        <version>2.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>