修复图形类型问题
1.java8数据聚集优化
2.数据库查询优化
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
修复图形类型问题
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0
修复图形类型问题--打包
删除打包文件
删除打包文件
修改计算sum的时候，判断数字类型条件
Merge pull request #27 from weiboxue/branch_1.1.0

add new file
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
modify home page
Merge branch 'branch_1.1.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.1.0
Rejected commit: Default
Merge remote-tracking branch 'remotes/upstream/branch_1.1.0' into branch_1.1.0

Conflicts:
	designer/src/main/resources/public/silkroad/home-new.html