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/service/TCheckAcceptRecordService.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java index d4dab5b..974dfb3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TCheckAcceptRecordService.java @@ -1,6 +1,11 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; +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; /** * <p> @@ -12,4 +17,11 @@ */ public interface TCheckAcceptRecordService extends IService<TCheckAcceptRecord> { + /** + * 获取验收记录分页列表 + * @param query + * @return + */ + PageInfo<TCheckAcceptRecordVO> pageList(TCheckAcceptRecordQuery query); + PageInfo<TCheckAcceptRecordVO> pageListApplet(TCheckAcceptRecordAppletQuery query); } -- Gitblit v1.7.1