Merge branch 'Bin_Local_User' into dev

Controller/UserController.py

@@ -1783,7 +1783,7 @@ class v3LoginView(TemplateView):
             auth_type = oauth_qs[0].authType
 
         region_id = 0
-        user_region_qs = UserRegionModel.objects.filter(userID_id=userID)
+        user_region_qs = UserRegionModel.objects.filter(user_id=userID)
         if user_qs.exists():
             region_id = user_region_qs[0].region_id
 
@@ -3254,7 +3254,7 @@ class v3LoginByCodeView(View):
             auth_type = oauth_qs[0].authType
 
         region_id = 0
-        user_region_qs = UserRegionModel.objects.filter(userID_id=userID)
+        user_region_qs = UserRegionModel.objects.filter(user_id=userID)
         if user_qs.exists():
             region_id = user_region_qs[0].region_id
 
@@ -3509,7 +3509,7 @@ class AppleAuthLogin(View):
         res['authType'] = auth_type
 
         region_id = 0
-        user_region_qs = UserRegionModel.objects.filter(userID_id=userID)
+        user_region_qs = UserRegionModel.objects.filter(user_id=userID)
         if user_qs.exists():
             region_id = user_region_qs[0].region_id
         res['region_id'] = region_id