修复天气选择，城市切换回上海的bug
Merge remote-tracking branch 'origin/master'