Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/views/Conversations/Online/ConversationsList.jsx

src/views/Conversations/Online/ConversationsList.jsx

@@ -260,7 +260,7 @@ const Conversations = () => {
           // addonBefore={<FilterOutlined />}
           // enterButton={'Filter'}
         />
-        {/* TODO 这个在完成搜索历史会话后去掉 */}
+        {/* TODO 这个在完成搜索历史会话后去掉，待讨论查询规则 */}
         <Tooltip key={'conversation-list'} title={activeList ? '隐藏会话' : '活跃会话'}>
           <Button onClick={toggleClosedConversationsList} icon={activeList ? <HistoryOutlined className='text-neutral-500' /> : <FireOutlined className=' text-orange-500' />} type='text' />
         </Tooltip>