fix 调整报表
调整report属性
Merge branch 'wls' of https://github.com/sanctityQ/beacon into wls

Conflicts:
	src/main/webapp/views/report/topInfo.jsp