代码合并解决冲突 bug修改

无关风月

2 天以前 e56c1cce484cd8df8c3373d4e2b5847d11b09abe

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

@@ -2,6 +2,9 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.OaApprovalFlowNode;
import com.ruoyi.system.query.ApprovalNodeListQuery;

import java.util.List;

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

    List<OaApprovalFlowNode> pageList(ApprovalNodeListQuery query);
}