去除类型比较，头像内容比较
Merge remote-tracking branch 'origin/master'