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

廖井涛

2025-08-28 58268d802176436e8282fc701c1aac76bc97cd90

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

@@ -34,7 +34,7 @@

    List<Map<String, String>> qualityReportMp(Date selectTime1, Date selectTime2, Report report);

    List<Map<String, String>> yieldMp(Date selectTime1, Date selectTime2, String selectProcesses, Report report);
    List<Map<String, String>> yieldMp(String selectTime1, String selectTime2, String selectProcesses, Report report);

    List<Map<String, String>> productionScheduleMp(String orderId);