省市平均风险值展示
Merge remote-tracking branch 'origin/master'

Conflicts:
	riskManagement/src/main/webapp/areaRisk.jsp
	riskManagement/src/main/webapp/cityRisk.jsp