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

廖井涛

2025-04-02 6146ab970705d0233a12b9fe475f9756e3271aa1

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

@@ -206,6 +206,8 @@
            map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
            //历史工序
            map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
            //是否合片工序
            map.put("laminating", laminating);
        }
        return map;
    }