闫鑫:提交稳定版本
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:解决冲突