From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 5dd5043..08ea887 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -186,7 +186,8 @@
map.put("totalAmount", totalAmount);
Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- return ResponseValue.success(downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets));
+ String filePath = downLoadExcel("鎶ュ簾鐧昏鍗�", sheets);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1