闫鑫:修改bug
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy