From 44b1fe9c919f833151445a30ba978beb041f8692 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 4bb8dbd..5dd5043 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
@@ -155,7 +155,7 @@
@ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
@@ -186,7 +186,7 @@
map.put("totalAmount", totalAmount);
Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- return downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+ return ResponseValue.success(downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets));
}
--
Gitblit v1.9.1