From 7a74745bad7ff20df9e170433c1e1cb851ce7fa9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 09:17:00 +0800
Subject: [PATCH] Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
index dd7c1e4..40a619f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/task/MemberTaskMapper.java
@@ -30,13 +30,13 @@
 
 
     /**
-     * @description  获取进行中任务数
+     * @description  商户端获取进行中任务数
      * @author  jqs
      * @date    2023/6/26 13:45
      * @param shopId
      * @return  Integer
      */
-    Integer getMemberIngTotal(@Param("shopId")Long shopId);
+    List<Integer> getMemberIngTotal(@Param("shopId")Long shopId);
 
 
     /**
@@ -47,4 +47,14 @@
      * @return  MemberTaskSimpleVo
      */
     MemberTaskSimpleVo getLastMemberTask(@Param("userId")Long userId);
+
+    /**
+     * @description  获取任务处理内容
+     * @author  jqs
+     * @date    2023/8/24 12:05
+     * @param taskId
+     * @return  List<String>
+     */
+    List<String> listDealContent(@Param("taskId")String taskId);
+
 }

--
Gitblit v1.7.1