Merge branch 'dev' of D:\idea\RuoYi-Vue-Plus with conflicts.

sxq

2021-06-11 56eba9cded865648465bc2c5815d47441e0457b1

 ruoyi-demo/pom.xml

@@ -23,11 +23,6 @@
            <artifactId>ruoyi-common</artifactId>
        </dependency>

        <dependency>
            <groupId>com.github.xiaoymin</groupId>
            <artifactId>knife4j-spring-boot-starter</artifactId>
        </dependency>

    </dependencies>

</project>