修改了新用户无城市的bug
Merge remote-tracking branch 'origin/master'