Merge branch 'master' of http://192.168.136.99:3000/SERVER/AnsjerServer

Controller/EquipmentInfo.py

@@ -86,7 +86,7 @@ class EquipmentInfo(View):
         try:
             nowTime = int(time.time())
             equipment_info = Equipment_Info(
-                userID=Device_User.objects.get(userID=userID),
+                userID_id=userID,
                 devUid=devUid,
                 Channel=Channel,
                 eventType=eventType,