Merge branch 'develop'

# Conflicts: # app/common/controller/NotifyController.php # app/common/service/UserService.php # app/crm/service/CustomerService.php # config/constants/Constants.php
2025-07-29 10:24:10 +08:00
parent d74b374198
commit 1f602a690b
4 changed files with 11 additions and 8 deletions
@@ -54,6 +54,7 @@ class UserService
        $ossservice = new OssService();
        return [
            'id' => $user->id,
+            'sn' => $user->sn,
            'name' => $user->name,
            'position' => $user->position,
            'socialize' => $user->socialize,
@@ -62,10 +63,11 @@ class UserService
            'country_id' => $user->country_id,
            'country_txt' => Country::where('id',$user->country_id)->value('cn_addr'),
            'avatar' => $user->avatar,
-            'avatar_full' => (!empty($user->avatar))?$ossservice->generatePrivateUrl($user->avatar):'',
+            'avatar_full' => $user->avatar,
            'phone' => $user->phone,
            'corp_name' => $corp_name,
            'email' => $user->email,
+            'sex' => $user->sex,
            'status' => $user->status,
            'roles' => $user->roles->pluck('name')
        ];