Merge remote-tracking branch 'origin/master'

jiangping

2024-12-31 b437ca4b3ba3fadc821e4b01398c3257e540fcb7

 server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java

@@ -24,14 +24,16 @@

    LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);

    LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request);

    LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request);


    LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request);
    LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
    /**
     * 根据 openId登录
     * @param userId
     * @param request
     * @return
     */
    String loginByUserId(Integer userId);