恢复代码
Merge branch 'master' of https://github.com/fly-high/photoMap