Merge remote-tracking branch 'origin/dev' into satoken

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
This commit is contained in:
疯狂的狮子li
2021-09-27 17:27:32 +08:00
25 changed files with 100 additions and 132 deletions

View File

@ -573,7 +573,7 @@ export default {
#end
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/${moduleName}/${businessName}/export', this.queryParams);
this.#[[$download]]#.excel('/${moduleName}/${businessName}/export', this.queryParams);
}
}
};