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

Controller/UserBrandControllerV2.py

@@ -51,7 +51,8 @@ class UserBrandV2(View):
         if userID and deviceSupplier and deviceModel:
             ub_qs = User_Brand.objects.filter(userID=userID)
             if ub_qs.exists():
-                return response.json(174)
+                ub_qs.update(deviceSupplier=deviceSupplier, deviceModel=deviceModel)
+                return response.json(0)
             else:
                 user = Device_User.objects.filter(userID=userID)
                 if not user.exists():