Merge branch 'master' of http://192.168.136.45:3000/SERVER/AnsjerPush

Controller/DetectController.py

@@ -92,7 +92,7 @@ class NotificationView(View):
             uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid,uid_set__detect_status=1). \
                 values('token_val', 'app_type', 'appBundleId','m_code',
                        'push_type', 'userID_id', 'userID__NickName',
-                       'lang', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group')
+                       'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group')
             # 新建一个list接收数据
             redis_list = []
             # 把数据库数据追加进redis_list
@@ -482,7 +482,7 @@ class PushNotificationView(View):
                 # 从数据库查询出来
                 uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
                     values('token_val', 'app_type', 'appBundleId',
-                           'push_type', 'userID_id', 'lang',
+                           'push_type', 'userID_id', 'lang','m_code',
                            'tz', 'uid_set__nickname')
                 # 新建一个list接收数据
                 redis_list = []