From 1841c1f665da1dd531f3d68c7979ad889b7d542a Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Mon, 6 May 2019 16:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=97=B6?=
 =?UTF-8?q?=E6=97=A2=E8=BF=94=E5=9B=9E=E6=B5=81=E5=8F=88=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?json=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/DepotItemController.java    | 6 +-----
 .../java/com/jsh/erp/controller/MaterialController.java     | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index 0b4a11fd..3c573e32 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -660,7 +660,7 @@ public class DepotItemController {
      * @return
      */
     @GetMapping(value = "/exportExcel")
-    public BaseResponseInfo exportExcel(@RequestParam("currentPage") Integer currentPage,
+    public void exportExcel(@RequestParam("currentPage") Integer currentPage,
                                         @RequestParam("pageSize") Integer pageSize,
                                         @RequestParam("projectId") Integer projectId,
                                         @RequestParam("monthTime") String monthTime,
@@ -717,10 +717,6 @@ public class DepotItemController {
             message = "导出失败";
             res.code = 500;
         }
-        /**
-         * 2019-01-15response已经返回，finally部分完全没必要
-         * */
-        return res;
     }
 
     /**
diff --git a/src/main/java/com/jsh/erp/controller/MaterialController.java b/src/main/java/com/jsh/erp/controller/MaterialController.java
index 4bf35c6b..1a078abd 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialController.java
@@ -199,7 +199,7 @@ public class MaterialController {
      * @return
      */
     @GetMapping(value = "/exportExcel")
-    public BaseResponseInfo exportExcel(@RequestParam("name") String name,
+    public void exportExcel(@RequestParam("name") String name,
                                         @RequestParam("model") String model,
                                         @RequestParam("categoryId") Long categoryId,
                                         @RequestParam("categoryIds") String categoryIds,
@@ -240,7 +240,6 @@ public class MaterialController {
             map.put("message", message);
             res.data = map;
         }
-        return res;
     }
 
     /**