增加了regularResolve
Merge branch 'master' of https://github.com/luomuwen/map_agent
Merge branch 'master' of https://github.com/luomuwen/map_agent
Merge branch 'master' of https://github.com/luomuwen/map_agent
修改了一个bug
Merge branch 'master' of https://github.com/luomuwen/map_agent
Merge branch 'master' of https://github.com/luomuwen/map_agent