聊天界面代码重构
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
代码重构bug；
Merge remote-tracking branch 'origin/master'