Merge pull request #13 from tianxiaoliang/master

SCB-1320 support combination query