Merge remote-tracking branch 'origin/master'

mitao

2024-06-05 e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a

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

@@ -5,6 +5,7 @@
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
@@ -23,7 +24,7 @@
 */
public interface IMemberService extends IService<Member> {

    AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto);
    AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception;

    Member getMembeid(MemberDTO memberDTO);