图片地址容错
Merge remote-tracking branch 'origin/master'