Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer

Controller/OrderContrller.py

@@ -129,7 +129,7 @@ class OrderView(View):
                     d['Type'] = did['Type']
                     # 如果存在序列号返回完整序列号
                     if did['serial_number']:
-                        d['UID'] = CommonService.get_full_serial_number(uid, did['serial_number'], did['Type'])
+                        d['UID'] = CommonService.get_full_serial_number(d['UID'], did['serial_number'], did['Type'])
                     data.append(d)
             d['rank__content'] = d['rank__lang__content']
             del d['rank__lang__content']

Controller/SensorGateway/SubDeviceController.py

@@ -149,7 +149,7 @@ class GatewaySubDeviceView(View):
                 return response.json(173)
             if nickName:
                 gateway_sub_qs.update(nickname=nickName)
-            elif room_id:
+            if room_id:
                 FamilyRoomDevice.objects.filter(sub_device=gateway_sub_id).update(room_id=room_id)
             return response.json(0)
         except Exception as e: