From 3d1c46677a3fb95a4d776735925047c08dee17a3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 18:17:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 11fb930..2f460c2 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
@@ -11,11 +11,9 @@
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MobileDTO;
-import com.ruoyi.system.api.domain.dto.*;
-
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
-
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -36,7 +34,7 @@
void authentificationMembe(MemberDTO memberDTO);
- List<Member> getMemberListByIds(Set<Long> memberIdList);
+ List<Member> getMemberListByIds(Collection<Long> memberIdList);
void mobile(@RequestBody MobileDTO mobileDTO);
@@ -66,4 +64,6 @@
PageDTO<MgtMemberPointsVO> getMemberPoints(MgtMemberPointsQuery query);
void updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO);
+
+ List<Member> getMemberListByCondition(MemberDTO memberDTO);
}
--
Gitblit v1.7.1