From c618ad79eb06675162fd4b26f6eccb28ac64b0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BE=B7=E5=AE=87?= <kvtodev@outlook.com>
Date: Tue, 28 Jul 2026 15:40:44 +0800
Subject: [PATCH] fix merge err

---
 .../EditorAgentConversationPanelView.test.tsx                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx b/src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx
index 77cf831f6..e64c65f6b 100644
--- a/src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx
+++ b/src/components/image-editor/EditorAgentConversation/EditorAgentConversationPanelView.test.tsx
@@ -310,7 +310,9 @@ describe('EditorAgentConversationPanelView', () => {
     expect(
       (screen.getByLabelText('发送给画布 Agent') as HTMLTextAreaElement).value,
     ).toBe('应保留到新会话的草稿');
-    expect(screen.getByText('角色图层')).toBeTruthy();
+    expect(
+      screen.getByText('一二三四五六七八九十甲乙丙丁戊己庚辛壬癸子丑寅卯'),
+    ).toBeTruthy();
     expect(
       screen.getByRole('option', { name: '角色参考' }),
     ).toBeTruthy();