整合打印参数json格式
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules.core/core-web-resources/src/main/resources/custome/gis/js/map/map.js
整合打印参数json格式