Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java

@@ -37,7 +37,7 @@
    List<Member> getMemberListByIds(Collection<Long> memberIdList);


    void mobile(@RequestBody MobileDTO mobileDTO);
    String mobile(@RequestBody MobileDTO mobileDTO);

    /**
     * 获取会员管理分页列表
@@ -66,4 +66,6 @@
    void updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO);

    List<Member> getMemberListByCondition(MemberDTO memberDTO);

    List<Member> getMemberListByLevel(List<String> memberLevelList);
}