From 2c706a5d58e8315980ea92d6b82e0e4959bad8ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 17:44:40 +0800
Subject: [PATCH] 1.修改单据导出 2.修改物品信息导入

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 5dd5eae..09ebe84 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -288,7 +288,7 @@
     @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
         @ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),})
     @GetMapping("/list/export")
-    public void export(Long id, Integer type, HttpServletResponse response) throws Exception {
+    public String export(Long id, Integer type, HttpServletResponse response) throws Exception {
 
         TemplateExportParams params;
         String fileName;
@@ -322,7 +322,7 @@
         map.put("totalAmount", totalAmount);
 
         Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
-        downLoadExcel(fileName, response, workbook);
+        return downLoadExcel(fileName, response, workbook);
 
     }
 

--
Gitblit v1.9.1