解决登录bug
solve merge conflict