修改smiley, 添加多选
Merge remote-tracking branch 'origin/master'