From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 04 六月 2023 13:13:54 +0800 Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java index edb3fd0..f3c2e85 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/task/MemberTaskRecordService.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.shop.domain.dto.MerMemberTaskPageDto; +import com.ruoyi.shop.domain.dto.MgtMemberTaskPageDto; import com.ruoyi.shop.domain.pojo.task.MemberTaskRecord; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.shop.domain.vo.MerMemberTaskRecordPageVo; +import com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo; import java.util.List; @@ -19,10 +21,17 @@ public interface MemberTaskRecordService extends IService<MemberTaskRecord> { /** - * + * 商户分页获取会员跟进任务 * @param page * @param merMemberTaskPageDto * @return */ List<MerMemberTaskRecordPageVo> pageMerMemberTaskRecord(Page page, MerMemberTaskPageDto merMemberTaskPageDto); + + /** + * 平台分页获取会员跟进任务 + * @param page + * @return + */ + List<MgtMemberFollowPageVo> pageMgtMemberFollow(Page page, MgtMemberTaskPageDto mgtMemberTaskPageDto); } -- Gitblit v1.7.1