From 1dad50645c6e61980f15b2be4505f75e7c922ee7 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
index 9c43884..b71e115 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java
@@ -32,6 +32,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -123,8 +125,8 @@
@GetMapping("exportData")
@ApiOperation("瀵煎嚭浜у搧妯″瀷")
@LogOperation("瀵煎嚭浜у搧妯″瀷")
- public Result exportDataExcel(Long shipId) {
- xhProductModelService.exportDataExcel(shipId);
+ public Result exportDataExcel(HttpServletRequest request, HttpServletResponse response, Long shipId,String fileName) {
+ xhProductModelService.exportDataExcel(request,response,shipId,fileName);
return null;
}
--
Gitblit v1.9.1