Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/UidSetController.py

@@ -298,11 +298,16 @@ class UidSetView(View):
             timestamp = int(time.time())
             uid_set = UidSetModel.objects.filter(uid=uid)
             if uid_set.exists():
-                uid_set.update(updTime=timestamp,region_alexa=region_alexa,is_alexa=is_alexa)
+                if region_alexa is None:
+                    uid_set.update(updTime=timestamp, is_alexa=is_alexa)
+                else:
+                    if is_alexa is None:
+                        uid_set.update(updTime=timestamp, region_alexa=region_alexa)
+                    else:
+                        uid_set.update(updTime=timestamp, region_alexa=region_alexa, is_alexa=is_alexa)
                 return response.json(0)
             else:
                 return response.json(173)
         except Exception:
             errorInfo = traceback.format_exc()
-            print(errorInfo)
             return response.json(500, {'details': errorInfo})