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

Controller/EquipmentManagerV3.py

@@ -172,8 +172,8 @@ class EquipmentManagerV3(View):
                         'nickname': nickname,
                     }
                     UidSetModel.objects.create(**uid_set_create_dict)
-                # di_qs = Device_Info.objects.filter(UID=uid)
-                # di_qs.update(NickName=nickname)
+                di_qs = Device_Info.objects.filter(UID=uid)
+                di_qs.update(NickName=nickname)
             # redisObj = RedisObject(db=8)
             # redisObj.del_data(key='uid_qs_' + userID)
             return response.json(0, res)