From 7abd7b5299e5bb6271ceaa936b88e2ee23a67bcb Mon Sep 17 00:00:00 2001
From: hawklin2017 <32898629+hawklin2017@users.noreply.github.com>
Date: Wed, 20 May 2026 22:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A5=BD=E5=8F=8Bremark?=
 =?UTF-8?q?=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=BE=A4=E8=B5=84=E6=96=99=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/rpc/group/group.go | 4 ++--
 protocol                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 639e20070..a2eaf3457 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -189,8 +189,8 @@ func (s *groupServer) resolveFriendDisplayName(ctx context.Context, ownerUserID,
 	if err != nil || len(users) == 0 {
 		return "", err
 	}
-	if users[0].FirstName != "" {
-		return users[0].FirstName, nil
+	if users[0].FirstName != "" || users[0].LastName != "" {
+		return users[0].FirstName + " " + users[0].LastName, nil
 	}
 	return users[0].Nickname, nil
 }
diff --git a/protocol b/protocol
index c5adb72b8..bf66521b2 160000
--- a/protocol
+++ b/protocol
@@ -1 +1 @@
-Subproject commit c5adb72b8d02244a5d3d7d814e607e9b6256fdd6
+Subproject commit bf66521b27c2302dcae38ff441b035cd443edf20