bug fix #36
Merge branch 'branch_1.2.0' of https://github.com/Baidu-ecom/bi-platform.git into branch_1.2.0