Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-05-23 e48e9687cc8bee98f5567807c2529cf7c7e9a9f8

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

@@ -329,4 +329,8 @@
        map.put("data",reportMapper.rawMaterialRequisitionMp( selectTime1,selectTime2,report));
        return map;
    }

    public List exportCrossProcessBreakingSv(List<LocalDate> dates) {
        return reportMapper.exportCrossProcessBreakingMp(dates);
    }
}