Merge branch '20241106_lj_chat'

app/JsonRpc/ChatService.php

@@ -59,7 +59,8 @@ class ChatService implements ChatServiceInterface
             })
             ->where('user.id', '<>', $userId)
             ->where('user.type_id', '<>', '20000')
-            ->select('user.*', 'chat_friends.friend_id')
+            ->select('user.*', 'chat_friends.remark as remark', 'chat_friends.id as isfriend')
+        // ->select('user.*', 'chat_friends.friend_id')
             ->get();
 
         return Result::success($result);