Merge remote-tracking branch 'origin/master'

mitao

昨天 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalService.java

@@ -1,7 +1,11 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.vo.system.ApprovalVO;

/**
 * <p>
@@ -13,4 +17,6 @@
 */
public interface OaApprovalService extends IService<OaApproval> {

    PageInfo<ApprovalVO> pageList(ApprovalListQuery query);

}