也加一行
Merge branch 'master' of github.com:miaoyushun/test