Merge remote-tracking branch 'origin/master'

mitao

1 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalApplicationStorageMapper.java

@@ -3,10 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.OaApprovalApplicationStorage;
import com.ruoyi.system.query.ApprovalDetailQuery;
import com.ruoyi.system.query.OaApprovalApplicationStoragePageQuery;
import com.ruoyi.system.vo.StorageListVO;
import com.ruoyi.system.vo.asset.OaApprovalApplicationStoragePageVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -25,4 +30,7 @@
     * @return 分页数据
     */
    IPage<OaApprovalApplicationStoragePageVO> selectApplicationStoragePage(Page<?> page, @Param("query") OaApprovalApplicationStoragePageQuery query);

    List<StorageListVO> pageList(@Param("query")ApprovalDetailQuery query, @Param("pageInfo")PageInfo<StorageListVO> pageInfo);

}