Commit bf161e69 authored by 王飞龙's avatar 王飞龙

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js
parent 59251f2c
...@@ -775,7 +775,7 @@ export default { ...@@ -775,7 +775,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/device/export', { this.download('business/device/export', {
...this.queryParams ...this.queryParams
}, `device_${new Date().getTime()}.xlsx`) }, `device_${new Date().getTime()}.xlsx`)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment