Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfDriverController.java

@@ -127,17 +127,17 @@ public class KwfDriverController {
      * @date 2023/07/11
      **/
     @PostMapping("/export")
-    public HttpResult export(@RequestBody Map<String, Object> params) {
+    public void export(@RequestBody Map<String, Object> params) {
         params.put("entId", LoginUserHolder.getEntId());
         /**分页数据**/
         List<KwfDriverVo> drivers = driverService.findPage(params);
 
         if (!CollectionUtils.isEmpty(drivers)) {
             HttpServletResponse response = RequestHolder.getResponse();
-            ExcelUtil.download(response, KwfDriverVo.class, drivers);
-            return null;
+            ExcelUtil.downData(response, KwfDriverVo.class, drivers);
+            //return null;
         }
-        return HttpResult.error("无数据！");
+        //return HttpResult.error("无数据！");
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfFleetController.java

@@ -85,7 +85,7 @@ public class KwfFleetController {
 
         if (!CollectionUtils.isEmpty(fleets)) {
             HttpServletResponse response = RequestHolder.getResponse();
-            ExcelUtil.download(response, KwfFleetVo.class, fleets);
+            ExcelUtil.downData(response, KwfFleetVo.class, fleets);
             return null;
         }
         return HttpResult.error("无数据！");

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -145,7 +145,7 @@ public class KwfTruckController {
 
         if (!CollectionUtils.isEmpty(trucks)) {
             HttpServletResponse response = RequestHolder.getResponse();
-            ExcelUtil.download(response, KwfTruckVo.class, trucks);
+            ExcelUtil.downData(response, KwfTruckVo.class, trucks);
             return null;
         }
         return HttpResult.error("无数据！");

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckReportController.java

@@ -78,7 +78,7 @@ public class KwfTruckReportController {
 
         if (!CollectionUtils.isEmpty(trucks)) {
             HttpServletResponse response = RequestHolder.getResponse();
-            ExcelUtil.download(response, KwfTruckReportVo.class, trucks);
+            ExcelUtil.downData(response, KwfTruckReportVo.class, trucks);
             return null;
         }
         return HttpResult.error("无数据！");