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

# Conflicts:
#	Model/models.py

Controller/UserBrandController.py

@@ -96,7 +96,8 @@ class UserBrandInfo(View):
         street = request_dict.get('street', None)
         longitude = request_dict.get('longitude', None)
         latitude = request_dict.get('latitude', None)
-        param_area = CommonService.get_param_flag(data=[country,province,city])
+        appId = request_dict.get('appId', None)
+        param_area = CommonService.get_param_flag(data=[country,province,city,appId])
         if  param_area is True:
             status = 1
             country = country
@@ -135,6 +136,7 @@ class UserBrandInfo(View):
                     country = country,
                     province = province,
                     city = city,
+                    appId=appId,
                     area = area,
                     street = street,
                     longitude = longitude,

Model/models.py

@@ -398,7 +398,7 @@ class User_Brand(models.Model):
 
     longitude = models.CharField(max_length=30, default='', verbose_name='经度')
     latitude = models.CharField(max_length=30, default='', verbose_name='纬度')
-
+    appId =  models.CharField(max_length=50, default='', verbose_name='appid_值')
     status = models.IntegerField(default=0, verbose_name='传国家省市信息过来就为状态：1 ，不传就为状态：0')
     ip = models.CharField(blank=True, max_length=20, default='', verbose_name=u'区域ip')