修改邮箱
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0

Conflicts:
	designer/src/main/resources/public/report-ui/src/core/xui-ui/e-chart.js