From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
index 1419bca..07154a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -44,7 +44,7 @@
/**
* 获取流水列表
*/
- @PreAuthorize("@ss.hasPermi('system:bankFlow:list')")
+ @PreAuthorize("@ss.hasPermi('flow:bank:detail:list')")
@ApiOperation(value = "获取银行流水列表")
@PostMapping("/list")
public R<PageInfo<TBankFlow>> list(@RequestBody TBankFlowQuery query) {
@@ -82,7 +82,6 @@
list.clear();
}
}
-
@Override
public void doAfterAllAnalysed(AnalysisContext context) {
int size = list.size();
@@ -91,12 +90,11 @@
}
}
}).sheet().doRead();
-
-
// 导出导入结果
HttpServletResponse response = WebUtils.response();
- response.setContentType("application/vnd.ms-excel;charset=utf-8");
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+ response.setHeader("Pragma", "no-cache");
if (failList.size() > 0) {
EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
} else {
@@ -105,7 +103,6 @@
failList.add(result);
EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
}
-
} catch (Exception e) {
e.printStackTrace();
System.err.println("银行流水返回结果导出失败");
--
Gitblit v1.7.1