引入地理信息模块
Merge remote-tracking branch 'origin/master'