From 32bd52ec49d25021b6a35d8ee5f32c70df788165 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 05 七月 2023 21:30:21 +0800
Subject: [PATCH] bug 用户端

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
index 2c7f7f3..741dab4 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java
@@ -5,10 +5,7 @@
 import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
 import com.ruoyi.goods.domain.pojo.activity.Activity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.goods.domain.vo.MerActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityListVo;
-import com.ruoyi.goods.domain.vo.MgtActivityPageVo;
-import com.ruoyi.goods.domain.vo.MgtActivityRecordPageVo;
+import com.ruoyi.goods.domain.vo.*;
 import com.ruoyi.system.api.domain.dto.MerPageDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -79,4 +76,15 @@
      * @return  List<Long>
      */
     List<String> listActivityIdByShopId(@Param("shopId")Long shopId);
+
+
+    /**
+     * @description  分页获取活动列表
+     * @author  jqs
+     * @date    2023/7/5 18:45
+     * @param page
+     * @param shopId
+     * @return  List<AppActivityPageVo>
+     */
+    List<AppActivityPageVo> pageAppActivity(Page page, @Param("shopId")Long shopId);
 }

--
Gitblit v1.7.1