Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.member.domain.dto.MerCashMemberPageDto;
import com.ruoyi.member.domain.dto.MerMemberPageDto;
import com.ruoyi.member.domain.dto.MerMemberTagEditDto;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
@@ -88,4 +89,24 @@
     * @param appMemberBindingDto
     */
    void updateMemberBinding(AppMemberBindingDto appMemberBindingDto);

    /**
     *
     * @param userId
     * @return
     */
    MerMemberBasicFileVo getMerMemberBasicFile(Long userId);

    /**
     *
     * @param userId
     * @return
     */
    List<MerMemberTagVo> getMerMemberTags(Long userId);

    /**
     *
     * @param merMemberTagEditDto
     */
    void editMerMemberTags(MerMemberTagEditDto merMemberTagEditDto);
}