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

Controller/UserController.py

@@ -3066,7 +3066,7 @@ class loginCodeView(View):
         sign_name = request_dict.get('sign_name', None)
 
         if phone and sign_name:
-            du_qs = Device_User.objects.filter(username=phone)
+            du_qs = Device_User.objects.filter(Q(phone=phone) | Q(username=phone))
             if not du_qs.exists():
                 return response.json(104)
             else: