用户信息
键盘框架修复
Merge branch 'master' into dev
键盘报错修复