上传图片；
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
传输图片初步；
Merge remote-tracking branch 'origin/master'