Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-22 c581a6c396f1b367fe132bc302d6337b1ff0ad6f

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -118,7 +118,6 @@
        Map<String,Object> map = new HashMap<>();
        map.put("data",reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
        map.put("total",reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, damageDetails));
        System.out.println(reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);