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

guoyujie

2025-06-21 2e2356dd4fec268f6be6ed923b14bfa667de0c0d

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

@@ -459,6 +459,7 @@
        if (process.equals("全部")){
            process="";
        }
        return reportMapper.exportTeamOutputMp(date,process);
        String laminating = reportMapper.getLaminating(process);
        return reportMapper.exportTeamOutputMp(date,process,laminating);
    }
}