Merge pull request #3 from tongyou1992/master

九次修改
测试是否产生冲突
Revert "测试是否产生冲突"

This reverts commit 2ea5b5aec5aec32ffb54ccc995ca56522b5c5ec6.
Merge pull request #4 from tongyou1992/master

十次 修改  --lhj
Merge pull request #1 from MinfeiZhou/master

tongbu  lhj