Merge branch 'master' into qintao
Merge pull request #7 from haoqoo/wanjunjun

Wanjunjun
Merge remote-tracking branch 'origin/wanjunjun' into qintao
删除git测试
Merge branch 'qintao' of https://github.com/haoqoo/shipin into qintao
删除测试文件
Merge pull request #8 from haoqoo/master

合并
合并
需求文档