修复图形种类bug
修改邮箱
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
add startup shell script
Merge branch 'master' of https://github.com/Baidu-ecom/bi-platform

Conflicts:
	designer/src/main/resources/public/report-ui/Gruntfile.js
	designer/src/main/resources/public/report-ui/asset-c/css/di-console-source.css
	designer/src/main/resources/public/report-ui/asset-c/di-console-source.js
	designer/src/main/resources/public/report-ui/asset-c/ecui-source.js
	designer/src/main/resources/public/report-ui/asset-c/highcharts-source.js
	designer/src/main/resources/public/report-ui/asset-c/xcore-source.js
	designer/src/main/resources/public/report-ui/asset-c/xui-ui-source.js
	designer/src/main/resources/public/report-ui/asset-p/di-stub-single.js
	designer/src/main/resources/public/report-ui/asset-p/di-stub.js
	designer/src/main/resources/public/report-ui/asset/-di-console-single.js
	designer/src/main/resources/public/report-ui/asset/css/-di-console-single.css
	designer/src/main/resources/public/report-ui/asset/css/-di-console.css
	designer/src/main/resources/public/report-ui/repo-conf.json
	designer/src/main/resources/public/report-ui/src/core/echarts/echarts-plain-original.js
	designer/src/main/resources/public/silkroad/asset/-di-product-single.js
	designer/src/main/resources/public/silkroad/asset/css/-di-product-single.css
publish report with same cube id
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
remove unused file
修改汇总标志设置问题
modify mapping
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
queryVm访问路径
添加数据更新支持
添加刷新rest接口
更新数据
修改url传参，以及放大镜问题
bug fix
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
bug fixed
bugfixed