解决忽略文件的冲突
Merge branch 'master' of https://github.com/yuanchunfa/yanchaoji10-14