Merge remote-tracking branch 'origin/master'

于杰

2025-08-29 6b6f3fbd333894209e0df1822ff89881aa4319fe

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

@@ -1036,4 +1036,11 @@

        return map;
    }

    public Map<String, Object> yieldProcessSv(String selectTime1, String selectTime2, Report report) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportMapper.yieldProcessMp(selectTime1, selectTime2, report));
        map.put("process", productionSchedulingMapper.selectProcess());
        return map;
    }
}