Merge remote-tracking branch 'origin/master'

mitao

18 小时以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

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

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

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

import java.util.List;

@@ -19,5 +16,5 @@
 */
public interface OaApprovalFlowNodeService extends IService<OaApprovalFlowNode> {

    List<OaApprovalFlowNode> pageList(ApprovalListQuery query);
    List<OaApprovalFlowNode> pageList(ApprovalNodeListQuery query);
}