From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
index bc6985c..05932d0 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -195,6 +195,11 @@
*/
List<Long> listIdBySendType(Integer sendType,Long shopId);
+
+ List<Long> listIdBySendType2(Long shopId);
+
+
+
/**
* @description 通过ids获取用户简易返回
* @author jqs
@@ -220,7 +225,7 @@
* @author jqs34
* @date 2023/6/18 16:47
*/
- MgtBulletinBoardVo boardMemberTotal();
+ MgtBulletinBoardVo boardMemberTotal(List<Long> shopIds);
/**
* @description 会员人数统计
--
Gitblit v1.7.1