Merge remote-tracking branch 'origin/master'

mitao

1 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalTodoServiceImpl.java

@@ -77,6 +77,14 @@
        return pageInfo;
    }

    @Override
    public PageInfo<OaApprovalTodo> pageListAudit(ApprovalTodoListQuery query) {
        PageInfo<OaApprovalTodo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<OaApprovalTodo> list = this.baseMapper.pageListAudit(query,pageInfo);
        pageInfo.setRecords( list);
        return pageInfo;
    }


    /**
     * 创建上级部门审批待办