Merge branch 'dev' into lang

Controller/EquipmentManagerV3.py

@@ -402,7 +402,9 @@ class EquipmentManagerV3(View):
             device_qs = device_qs.filter(~Q(isExist=2))
             if device_qs.exists():
                 if fuzzy:
-                    device_qs = device_qs.filter(Q(UID__contains=fuzzy) | Q(NickName__contains=fuzzy)).values('id', 'userID', 'NickName', 'UID', 'View_Account',
+                    device_qs = device_qs.filter(Q(UID__contains=fuzzy) | Q(NickName__contains=fuzzy))
+
+                device_qs = device_qs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                'View_Password', 'ChannelIndex', 'Type', 'isShare',
                                'primaryUserID', 'primaryMaster', 'data_joined',
                                'version', 'isVod', 'isExist', 'NotificationMode')