Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-10-23 77c7984fb636f81a87208aea2bcffc701f6419e8

 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);