fix 聊天室页面功能。重复可删除
Merge remote-tracking branch 'origin/dev' into dev