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

guoyuji

2024-07-10 15e254a574f0c8bc2f7054d9d09c89f95afdd6bb

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

@@ -19,7 +19,6 @@
    /*获取返工新增功能数据*/
    public Map<String,Object> queryRework (Integer pageNum, Integer pageSize,ReportingWorkDetail reportingWorkDetail ) {
        Integer offset = (pageNum-1)*pageSize;

        Map<String,Object> map = new HashMap<>();
        map.put("data",reportingWorkDetailMapper.queryReworkAdd(offset,pageSize, reportingWorkDetail));
        return map;