指标计算更新
Merge branch 'master' of https://github.com/luomuwen/map_agent.git

Conflicts:
	config/logger.properties