修改聊天表情显示不全的bug
Merge remote-tracking branch 'origin/master'