Merge remote-tracking branch 'origin/develop' into develop

develop
guyuliang 2024-08-26 16:40:21 +08:00
commit c53a32c1ba
1 changed files with 1 additions and 1 deletions

View File

@ -146,7 +146,7 @@ public class TrxServiceImpl implements TrxService {
log.error("用户登录失败:", e); log.error("用户登录失败:", e);
return new GeneralResult(false, "用户登录失败" + e.getMessage()); return new GeneralResult(false, "用户登录失败" + e.getMessage());
} }
return new GeneralResult(true, login, "用户登录成功"); return login;
} }
private void saveUserByTrx(String userId) { private void saveUserByTrx(String userId) {