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

Controller/UserBrandController.py

@@ -97,7 +97,10 @@ class UserBrandInfo(View):
         longitude = request_dict.get('longitude', None)
         latitude = request_dict.get('latitude', None)
         appId = request_dict.get('appId', None)
-        param_area = CommonService.get_param_flag(data=[country,province,city,appId])
+        param_area = CommonService.get_param_flag(data=[country])
+        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')
         if  param_area is True:
             status = 1
             country = country