Merge remote-tracking branch 'origin/master'

rk

2025-09-29 218e84d2264e413f31a2f3957f05bb7b8ad42d5d

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -1,17 +1,14 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.StagingDataVO;
import com.doumee.dao.business.dto.RegisterDriverDTO;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
@@ -173,20 +170,13 @@
     * @param code
     * @return
     */
    WxAuthorizeVO wxAuthorize(String code);
    WxAuthorizeVO wxAuthorize(String code,Integer source);



    List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);


    /**
     * 账号密码
     * 内部人员/劳务访客登录
     * @param accountLoginDTO
     * @return
     */
    WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);

    /**
     * 内部可拜访人员分页
@@ -215,5 +205,7 @@
    String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser);


    List<Member>  findDriveList(Member model);

    void initPinyinTool();
}