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

 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

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

	ruoyi-generator/src/main/resources/vm/java/controller.java.vm

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

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java

	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java

	ruoyi-ui/package.json

	ruoyi-ui/src/api/monitor/logininfor.js

	ruoyi-ui/src/api/monitor/operlog.js

	ruoyi-ui/src/api/system/config.js

	ruoyi-ui/src/api/system/dict/data.js

	ruoyi-ui/src/api/system/dict/type.js

	ruoyi-ui/src/api/system/post.js

	ruoyi-ui/src/api/system/role.js

	ruoyi-ui/src/api/system/user.js

	ruoyi-ui/src/main.js

	ruoyi-ui/src/utils/request.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/operlog/index.vue

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

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

	ruoyi-ui/src/views/system/dict/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/main.js

@@ -12,6 +12,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' //directive
 import plugins from './plugins' // plugins
+import { download } from '@/utils/request'
 
 import './assets/icons' // icon
 import './permission' // permission control
@@ -43,6 +44,7 @@ Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 
 // 全局组件挂载