From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index 30e138c..e4c3f49 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -10,6 +10,7 @@
 import com.ruoyi.shop.domain.dto.MerFollowAgencyTaskDto;
 import com.ruoyi.shop.domain.dto.MerFollowPhoneDto;
 import com.ruoyi.shop.domain.pojo.task.*;
+import com.ruoyi.shop.domain.vo.MerAgencySimpleTaskRecordPageVo;
 import com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo;
 import com.ruoyi.shop.mapper.task.AgencyTaskMapper;
 import com.ruoyi.shop.service.task.AgencyTaskRecordService;
@@ -55,6 +56,19 @@
     }
 
     /**
+     * @description
+     * @author  jqs
+     * @date    2023/8/1 18:16
+     * @param page
+     * @param merAgencyTaskPageDto
+     * @return  List<MerAgencySimpleTaskRecordPageVo>
+     */
+    @Override
+    public List<MerAgencySimpleTaskRecordPageVo>pageMerAgencySimpleTaskRecord(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
+        return agencyTaskMapper.pageMerAgencySimpleTaskRecord(page, merAgencyTaskPageDto);
+    }
+
+    /**
      *
      * @param merCreateAgencyTaskDto
      */

--
Gitblit v1.7.1