file modified
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0

Conflicts:
	designer/src/main/java/com/baidu/rigel/biplatform/ma/report/service/impl/ChartBuildServiceImpl.java
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0
context初始化
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0

Conflicts:
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/query/model/QueryRequest.java
Merge branch 'master' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0
代码重构--单表查询
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0

Conflicts:
	designer/src/main/java/com/baidu/rigel/biplatform/ma/resource/QueryDataResource.java
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/query/model/QueryRequest.java
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/request/build/QueryRequestBuilder.java
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/resource/ReportQueryResource.java
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0

Conflicts:
	designer/src/main/resources/conf/register_mail.properties
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform into branch_1.1.0

Conflicts:
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/query/result/trans/QueryTableResultBuilder.java
	designer/src/main/java/com/baidu/rigel/biplatform/ma/rt/resource/ReportQueryResource.java
删除“运营产品”字样
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