From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Thu, 15 Jun 2023 11:16:11 +0800 Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall --- src/main/java/cc/mrbird/febs/mall/mapper/MallActSetMapper.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallActSetMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallActSetMapper.java index 39c372c..1835aaa 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallActSetMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallActSetMapper.java @@ -1,7 +1,9 @@ package cc.mrbird.febs.mall.mapper; +import cc.mrbird.febs.mall.dto.ApiMallActListDto; import cc.mrbird.febs.mall.entity.MallActSet; import cc.mrbird.febs.mall.vo.AdminMallActSetVo; +import cc.mrbird.febs.mall.vo.ApiMallActListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,4 +13,5 @@ IPage<AdminMallActSetVo> selectMallActsInPage(Page<AdminMallActSetVo> page, @Param("record")MallActSet mallActSet); + IPage<ApiMallActListVo> selectApiMallActListInPage(@Param("record")ApiMallActListDto apiMallActListDto, Page<ApiMallActListVo> page); } -- Gitblit v1.9.1