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


 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

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

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

	ruoyi-ui/src/assets/styles/sidebar.scss

	ruoyi-ui/src/layout/components/Settings/index.vue

	ruoyi-ui/src/layout/index.vue

	ruoyi-ui/src/store/modules/app.js

	ruoyi-ui/src/store/modules/permission.js

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

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

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

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

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

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

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

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

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