修改bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/WebRoot/js/map_gis.js