Merge branch 'qintao'
上传需求文档
Merge branch 'master' of https://github.com/haoqoo/shipin