Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Manager/AuthController.php

@@ -307,6 +307,7 @@ class AuthController extends Controller
         $user = $this->guard()->user();
         $user = (new Manager())->with("projects")->find($user->id);
         $user->password = null;
+        $user->no_lock_ability = $user->order_status_ability;
         $user = $user->toArray();
 
         return response()->json([