Merge branch 'qintao'
Merge branch 'master' into qintao
上传需求文档
Merge branch 'master' of https://github.com/haoqoo/shipin
Merge pull request #4 from haoqoo/wanjunjun

test
Merge pull request #5 from haoqoo/qintao

拉数据
Merge branch 'master' into wanjunjun
ch test