test

test git for mac
Merge branch 'ericlinj'
特征查询默认查询类型给0
Merge pull request #1 from airballoon/bingo

更新feature
Merge branch 'master' of https://github.com/airballoon/stars

# By heatroom
# Via heatroom
* 'master' of https://github.com/airballoon/stars:
  更新feature
更新feature页面