From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 三月 2025 15:50:03 +0800 Subject: [PATCH] fix: resolve merge conflicts in .gitignore --- ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java index 2a7f4d6..7e6f416 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCheckAcceptRecordMapper.java @@ -1,7 +1,14 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TCheckAcceptRecord; +import com.ruoyi.system.query.TCheckAcceptRecordAppletQuery; +import com.ruoyi.system.query.TCheckAcceptRecordQuery; +import com.ruoyi.system.vo.TCheckAcceptRecordVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * <p> @@ -13,4 +20,14 @@ */ public interface TCheckAcceptRecordMapper extends BaseMapper<TCheckAcceptRecord> { + /** + * 分页查询验收记录 + * @param query + * @param pageInfo + * @return + */ + List<TCheckAcceptRecordVO> pageList(@Param("query") TCheckAcceptRecordQuery query, @Param("pageInfo")PageInfo<TCheckAcceptRecordVO> pageInfo); + List<TCheckAcceptRecordVO> pageListApplet(@Param("query") TCheckAcceptRecordAppletQuery query, @Param("pageInfo")PageInfo<TCheckAcceptRecordVO> pageInfo); + + } -- Gitblit v1.7.1