合并提交

Controller/EquipmentManager.py

@@ -1252,6 +1252,7 @@ def update_uid_set(request):
                     'updTime': nowTime,
                     'version': version,
                     'ucode': ucode,
+                    'device_type': dvqs[0].Type
                 }
                 UidSetModel.objects.create(**uid_set_create_dict)
             return response.json(0)

Controller/FeedBack.py

@@ -1,17 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/1/18 10:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: SysMsg.py
-@Contact: chanjunkai@163.com
-"""
-
 import json
 import time