气候中心项目修改
Merge branch 'master' of https://github.com/panbasten/BA

Conflicts:
	base/fly-service/src/main/java/com/flywet/platform/bi/rest/BIPortaletResource.java