From ab72e2095b84633bce8154b0ae8a111a93968fc7 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 1 Jul 2024 18:03:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=88=B9=E5=8F=AA=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/user/UserController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php
index 301a16a8d..78a8e4acd 100644
--- a/app/api/controller/user/UserController.php
+++ b/app/api/controller/user/UserController.php
@@ -10,6 +10,7 @@ use app\common\enum\PayEnum;
 use app\common\logic\PaymentLogic;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use support\Cache;
 use think\Exception;
@@ -276,6 +277,7 @@ class UserController extends BaseApiController
                     $brigade_name=Db::name('geo_brigade')->where('id',$address['brigade'])->value('brigade_name');
                     $address['address_like']=$city_name.$area_name.$street_name.$village_name.$brigade_name;
                 }
+                $user['ship_name']=$user['user_ship']>0?UserShip::where('id',$user['user_ship'])->value('title'):'';
                 $user['address_info']=$address;
                 return $this->success('ok',$user->toArray());
             }else{