Merge commit '469e9491df0b84dc31b438b2f28f5964a3002202' into dev/permission

* commit '469e9491df0b84dc31b438b2f28f5964a3002202':
  增加 prompt-info 样式

# Conflicts:
#	src/pages/deepseek/questionAnswer/info/index.tsx
#	src/pages/deepseek/questionAnswer/info/style.less

src/pages/deepseek/questionAnswer/info/index.tsx

@@ -701,7 +701,12 @@ const QuestionAnswerInfo: React.FC = () => {
                             </Splitter.Panel>
                             <Splitter.Panel defaultSize="35%">
 
+<<<<<<< HEAD
                                 <div className='flex-center-container'>
+=======
+
+                                                                    <div className='flex-center-container'>
+>>>>>>> 469e9491df0b84dc31b438b2f28f5964a3002202
                                     <div className='half-width'>
                                         <div className='flex-center-top'>
                                             欢迎使用 {name}