代码合并解决冲突 bug修改

无关风月

2 天以前 e56c1cce484cd8df8c3373d4e2b5847d11b09abe

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.OaApprovalApplications;
import com.ruoyi.system.query.ApprovalTodoListQuery;

/**
 * <p>
@@ -13,4 +15,5 @@
 */
public interface OaApprovalApplicationsService extends IService<OaApprovalApplications> {

    PageInfo<OaApprovalApplications> pageListAudit(ApprovalTodoListQuery query);
}