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

guoyuji

2025-03-04 ccc2589e5fe52fbdf47f4f68f9c4b2de373bf416

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

@@ -542,6 +542,7 @@
        Map<String, Object> map = new HashMap<>();
        map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));
        map.put("footSum" ,reportingWorkMapper.getFootSum(selectTime1, selectTime2, orderId,reportingWork));
        return map;
    }