Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: ed66c728c722ac8d8c897108caf5b9409416af9b
+  newTag: ce19706473a14cce96bc651838935727d7ee03a3

src/api/interface/systemManageType.ts

@@ -388,6 +388,8 @@ export type listUserAndRoleByCompanyIdType = InterFunction<
      */
     userAccountId: number;
     userAccountVO: UserInfoType;
+    serviceAlias: string;
+    serviceImg: string;
   }[]
 >;
 // 用户信息列表

src/pages/messageManage/messageChat/comp/MessageChatRole/index.tsx

@@ -22,13 +22,17 @@ const MessageChatRole: React.FC<{
           key={j}
           onClick={() => handleSelect(i)}
         >
-          <img className={'image'} src={i?.userAccountVO?.userImg} alt={i?.roleName} />
+          <img
+            className={'image'}
+            src={i?.serviceImg || i?.userAccountVO?.userImg}
+            alt={i?.roleName}
+          />
           <div className='content flex-start'>
             <div
               className='title text-ellipsis'
-              title={i?.userAccountVO?.nickName || i?.userAccountVO?.userName}
+              title={i?.serviceAlias || i?.userAccountVO?.nickName || i?.userAccountVO?.userName}
             >
-              {i?.userAccountVO?.nickName || i?.userAccountVO?.userName}
+              {i?.serviceAlias || i?.userAccountVO?.nickName || i?.userAccountVO?.userName}
             </div>
             <div className='role'>{i?.roleName}</div>
           </div>