From 45bfb77d4b4d1b1d3204475caba9b9c0e3e04ef9 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:58:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 7fbe456..bfb6d88 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -27,7 +27,7 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
@@ -58,7 +58,7 @@
@Autowired
private LWhFormInventoryService lWhFormInventoryService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @Description 鏂板
@@ -329,7 +329,8 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
- return ResponseValue.success(downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook));
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
--
Gitblit v1.9.1