增加一个全部照片的uiMerge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'