聊天
Merge remote-tracking branch 'origin/master'
* 聊天图文混排
添加coretext
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
聊天插入表情修改