修改导出时既返回流又返回json数据导致后台异常的问题

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;
     }
 
     /**

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;
     }
 
     /**