Merge branch 'feature_asset'

mitao

昨天 6534aeb7d0f8bf1541140645d161ffade21b3fbc

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

@@ -1,7 +1,10 @@
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.vo.system.ApprovalVO;

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

    PageInfo<ApprovalVO> pageList(ApprovalListQuery query);

}