Merge remote-tracking branch 'origin/master'

cy

2023-12-07 ba74a8c6b9e5bef2240dda9c8880bc851994f801

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

@@ -172,8 +172,6 @@
        map.put("code", businessFormCode);
        map.put("date", DateUtils.toShowDate(dealTime));
        map.put("name", operatorName);
        map.put("countNum", 0);
        map.put("totalAmount", 0);
        map.put("dataList", export);

        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);