Prechádzať zdrojové kódy

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

Ansjer 1 rok pred
rodič
commit
21c7b68bf5
1 zmenil súbory, kde vykonal 1 pridanie a 2 odobranie
  1. 1 2
      AdminController/UserManageController.py

+ 1 - 2
AdminController/UserManageController.py

@@ -912,7 +912,6 @@ class UserManagement(View):
             customized_push_list = []
             for customized_push in customized_push_qs:
                 # 格式化数据
-                device_type_list = customized_push['device_type'].split(',')
                 register_period = customized_push['register_period'] + '年'
                 time_zone = 'UTC ' + customized_push['time_zone']
 
@@ -923,7 +922,7 @@ class UserManagement(View):
                     'link': customized_push['link'],
                     'icon_link': customized_push['icon_link'],
                     'country': customized_push['country'],
-                    'device_type_list': device_type_list,
+                    'device_type': customized_push['device_type'],
                     'register_period': register_period,
                     'time_zone': time_zone,
                     'push_time': customized_push['push_time'],