1.修复isLoc参数上行错误0当前城市1非当前城市
Merge branch 'chenxy' into tanggw