修改登陆部分BUG
Merge remote-tracking branch 'origin/BKBranch'