修改后
声明
Merge branch 'master' of https://github.com/ruoshui/xing