Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/RegionController.py

@@ -332,6 +332,8 @@ class RegionView(View):
                 country_qs = country_qs.annotate(api=F('country__region__zosi_api'))
             elif 'Loocam' in app_name:
                 country_qs = country_qs.annotate(api=F('country__region__loocam_api'))
+            elif '新中性' in app_name:
+                country_qs = country_qs.annotate(api=F('country__region__neutral_api'))
             else:
                 country_qs = country_qs.annotate(api=F('country__region__api'))
             country_qs = country_qs.values('country_id', 'country_name', 'api', 'push_api').order_by('country_id')

Model/models.py

@@ -1995,6 +1995,7 @@ class RegionModel(models.Model):
     api = models.CharField(max_length=50, default='', verbose_name='域名')
     zosi_api = models.CharField(max_length=50, default='', verbose_name='周视域名')
     loocam_api = models.CharField(max_length=50, default='', verbose_name='录看域名')
+    neutral_api = models.CharField(max_length=50, default='', verbose_name='中性域名')
     push_api = models.CharField(max_length=50, default='', verbose_name='推送域名')
 
     class Meta: