修改头像位置
修改头像
Merge remote-tracking branch 'origin/master' into chenyan
。
Merge branch 'chenyan'