Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

Controller/UserBrandController.py

@@ -100,13 +100,6 @@ class UserBrandInfo(View):
         longitude = request_dict.get('longitude', None)
         latitude = request_dict.get('latitude', None)
         appId = request_dict.get('appId', None)
-
-        if country is None:
-            country=''
-        if province is None:
-            province=''
-        if city is None:
-            city = ''
         if area is None:
             area=''
         if street is None:
@@ -115,7 +108,7 @@ class UserBrandInfo(View):
             longitude=''
         if latitude is None:
             latitude=''
-        param_area = CommonService.get_param_flag(data=[country,province,city,longitude,latitude])
+        param_area = CommonService.get_param_flag(data=[country,province,city])
         must_fill_in = CommonService.get_param_flag(data=[appId,deviceSupplier,deviceModel,osType,osVersion])
         if must_fill_in is False:
             return response.json(444,'appId,deviceSupplier,deviceModel,osType,osVersion')