于强:解决冲突
Merge branch 'master' of github.com:yanxin59/CarrotFantasy
于强:添加otp