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

Controller/SensorGateway/SubDeviceController.py

@@ -633,10 +633,10 @@ class GatewaySubDeviceView(View):
         online = int(online)
         try:
             if online == 2:     # 复位删除设备
-                gateway_sub_device_qs = GatewaySubDevice.objects.filter(ieee_addr=ieee_addr).values('id')
+                gateway_sub_device_qs = GatewaySubDevice.objects.filter(ieee_addr=ieee_addr)
                 if not gateway_sub_device_qs.exists():
                     return response.json(0)
-                sub_device_id = gateway_sub_device_qs[0]['id']
+                sub_device_id = gateway_sub_device_qs.values('id')[0]['id']
                 # 删除设备信息,场景信息,场景日志
                 with transaction.atomic():
                     gateway_sub_device_qs.delete()