From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期六, 12 七月 2025 17:09:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' --- src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java index c472256..1336f39 100644 --- a/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java +++ b/src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java @@ -1,12 +1,12 @@ package com.ruoyi.procurementrecord.mapper; -import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.procurementrecord.dto.ProcurementDto; import com.ruoyi.procurementrecord.dto.ProcurementPageDto; -import com.ruoyi.procurementrecord.pojo.ProcurementRecord; +import com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy; +import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,7 +15,7 @@ * @author :yys * @date : 2025/7/7 14:30 */ -public interface ProcurementRecordMapper extends BaseMapper<ProcurementRecord> { +public interface ProcurementRecordMapper extends BaseMapper<ProcurementRecordStorage> { /** * 鏍规嵁閲囪喘鍙拌处id鏌ヨ閲囪喘鍏ュ簱淇℃伅 * @@ -26,5 +26,9 @@ IPage<ProcurementPageDto> listPage(Page page,@Param("req") ProcurementPageDto procurementDto); + IPage<ProcurementPageDtoCopy> listPageCopy(Page page, @Param("req") ProcurementPageDto procurementDto); + + List<ProcurementPageDtoCopy> listCopy(); + List<ProcurementPageDto> list(); } -- Gitblit v1.9.3