From 71fd3964aacb88c150bec97b90452989fb2b380b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 06 六月 2024 11:46:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
index a6857fd..96584eb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java
@@ -1,15 +1,17 @@
 package com.ruoyi.member.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.api.domain.dto.MemberDTO;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
+import com.ruoyi.member.controller.management.vo.MgtMemberVO;
 import com.ruoyi.system.api.domain.AppMiniLoginVO;
 import com.ruoyi.system.api.domain.Member;
 import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
 import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
-import org.springframework.web.bind.annotation.RequestBody;
-
+import com.ruoyi.system.api.domain.dto.MemberDTO;
 import java.util.List;
 import java.util.Set;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -32,4 +34,12 @@
     List<Member> getMemberListByIds(Set<Long> memberIdList);
 
     AppMiniLoginVO miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO);
+
+    /**
+     * 获取会员管理分页列表
+     *
+     * @param query 会员列表查询对象
+     * @return PageDTO<MgtMemberVO>
+     */
+    PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query);
 }

--
Gitblit v1.7.1