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

guoyujie

2025-07-15 35706002455c370eca21e177b95e39cff78f8f5b

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

@@ -543,7 +543,7 @@
        return reportMapper.exportYieldMp(date,process);
    }

    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
    public Map<String, Object> teamOutputSv(Integer pageNum, Integer pageSize, String selectTime1, String selectTime2, String selectProcesses, TeamOutputDTO teamOutputDTO) {
        if (selectProcesses.equals("全部")){
            selectProcesses="";
        }