Merge branch 'master' into develop

app/Api/Controllers/UserController.php

@@ -42,7 +42,7 @@ public function login(Request $request)
 
             return $this->success($data);
         } else {
-            return $this->fail('登录错误~');
+            return $this->failed('登录错误~');
         }
     }