Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into locky

Controller/UserController.py

@@ -2045,11 +2045,11 @@ class v3LoginView(TemplateView):
                                            push_type=push_type, token_val=token_val, m_code=m_code, lang=lang, tz=tz)
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-        number = int(number)
         region_country = users['region_country']
-        if not number or number == 0:
+        if not number or number == '0':
             user_qs.update(last_login=now_time, language=response.lang)
         else:
+            number = int(number)
             if number != region_country and region_country != 0:
                 res['status'] = 1
                 user_qs.update(last_login=now_time, language=response.lang)