解决表情不能点的bug
update
Merge remote-tracking branch 'origin/master'