Merge remote-tracking branch 'origin/master'

石广澎

2023-12-13 6b36599c6bd372a5cce5e078c2f4e4cb9e2ee36a

 consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java

@@ -186,7 +186,8 @@
        map.put("totalAmount", totalAmount);

        Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
        return ResponseValue.success(downLoadExcel("报废登记单", response, sheets));
        String filePath = downLoadExcel("报废登记单", response, sheets);
        return ResponseValue.success("导出成功", filePath);

    }