添加了获取全部人的照片的Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'