Merge branch 'Haozi' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/UserController.php

@@ -141,7 +141,7 @@ class UserController extends Controller
         $user=$user->loadMissing('userDetail');
         if ($phone){
             if (!$user->userDetail) UserDetail::query()->create(['user_id'=>$user->id,'mobile_phone'=>$phone]);
-            if ($phone!=$user->userDetail->mobile_phone) UserDetail::query()->where('user_id',$user->id) ->update(['mobile_phone'=>$phone]);
+            UserDetail::query()->where('user_id',$user->id) ->update(['mobile_phone'=>$phone]);
         }
         app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
         return redirect('maintenance/user/')->with('successTip',"成功修改用户“{$user['name']}”！");