Merge branch 'master' into qintao
Merge remote-tracking branch 'origin/wanjunjun' into qintao
删除git测试
Merge branch 'qintao' of https://github.com/haoqoo/shipin into qintao