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

huang

2024-11-12 54c2f0fda44123782e5241ff7d1ad6e81c95f2b2

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