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

廖井涛

2024-10-14 b7546c0dcc65d193b7a549aa267a70a1a2dcac61

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportMapper.java

@@ -55,7 +55,7 @@

    List<ProcessToBeCompletedDTO> exportProcessToBeCompletedMp(List<LocalDate> date, String process, String inputVal, String project);

    List<WorkInProgressDTO> exportWorkInProgressMp(List<LocalDate> date, String process, String inputVal, String project);
    List<WorkInProgressDTO> exportWorkInProgressMp( String process, String inputVal, String project);

    List<TaskCompletionStatusDTO> exportTaskCompletionStatusMp(Map<String, Object> dates);