。删掉了一些冗余代码
Merge branch 'master' of https://github.com/tcmaster/OurProject