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


 Conflicts:

	pom.xml

	ruoyi-admin/pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-ui/src/layout/components/Navbar.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/src/views/tool/swagger/index.vue