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

Controller/EquipmentInfo.py

@@ -84,9 +84,10 @@ class EquipmentInfo(View):
         if not device_info.exists():
             return response.json(14)
         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,