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

Controller/EquipmentManager.py

@@ -349,9 +349,9 @@ def admin_addInterface(request):
     request.encoding = 'utf-8'
     response = ResponseObject()
     if request.method == 'POST':
-        request_dict = request.POST
-    elif request.method == 'GET':
-        request_dict = request.GET
+        request_dict = request.body
+    if request.method == 'GET':
+        request_dict = request.body
     else:
         return response.json(444)
     token = request_dict.get('token', None)

Model/models.py

@@ -542,5 +542,31 @@ class UID_Bucket(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('id',)
 
+    class UID_App(models.Model):
+        id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
+        uid = models.CharField(max_length=20, verbose_name='设备UID')
+        app = models.ForeignKey(App_Info, blank=True, to_field='id', on_delete=models.CASCADE,
+                                verbose_name='关联到APP表的id')
+        app_type = models.IntegerField(default='', verbose_name=u'app类型')
+        addTime = models.IntegerField(verbose_name='添加时间', default=0)
+        updTime = models.IntegerField(verbose_name='更新时间', default=0)
+        endTime = models.IntegerField(verbose_name='结束时间', default=0)
+        class Meta:
+            db_table = 'uid_app'
+            verbose_name = u'设备关联APP表'
+            verbose_name_plural = verbose_name
+            ordering = ('id',)
+
+    class NameTest(models.Model):
+        id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
+        updTime = models.IntegerField(verbose_name='更新时间', default=0)
+        endTime = models.IntegerField(verbose_name='结束时间', default=0)
+
+        class Meta:
+            db_table = 'name_test'
+            verbose_name = u'测试表'
+            verbose_name_plural = verbose_name
+            ordering = ('id',)
+
     def __str__(self):
         return self.id