From e74984e0e05d8807eda19d0a3f7fb9e23771619d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 3 Jul 2026 17:00:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98=20=E5=A4=B4=E5=83=8Furl?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=8B=AC=E7=AB=8B=E5=AD=97=E6=AE=B5=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/types.ts            | 7 +++++--
 src/layouts/BasicLayout.tsx             | 2 +-
 src/pages/system/user/profile/index.tsx | 2 +-
 src/stores/userStore.ts                 | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 3600eeb8..d97192b4 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -8,7 +8,8 @@ export interface UserInfo {
     userId: string | number;
     userName: string;
     nickName?: string;
-    avatar?: string;
+    avatar?: string | number;
+    avatarUrl?: string;
     deptName?: string;
   };
   roles: string[];
@@ -26,6 +27,7 @@ export interface UserForm {
   gender?: string;
   status?: string;
   remark?: string;
+  avatar?: string | number;
   postIds?: Array<string | number>;
   roleIds?: Array<string | number>;
 }
@@ -68,7 +70,8 @@ export interface UserVO extends BaseEntity {
   email?: string;
   phoneNumber?: string;
   gender?: string;
-  avatar?: string;
+  avatar?: string | number;
+  avatarUrl?: string;
   status?: string;
   deptName?: string;
   roles?: RoleVO[];
diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index 86f92795..0cfb633c 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -454,7 +454,7 @@ export default function BasicLayout() {
         )}
         subMenuItemRender={(item, _dom) => menuNode(item as RuntimeMenuItem)}
         avatarProps={{
-          src: userInfo?.user.avatar || defaultAvatar,
+          src: userInfo?.user.avatarUrl || defaultAvatar,
           title: userInfo?.user.nickName || userInfo?.user.userName,
           render: (_, dom) => (
             <Dropdown menu={{ items: userMenu }} placement="bottomRight" trigger={['click']}>
diff --git a/src/pages/system/user/profile/index.tsx b/src/pages/system/user/profile/index.tsx
index 57962ec5..d48bea94 100644
--- a/src/pages/system/user/profile/index.tsx
+++ b/src/pages/system/user/profile/index.tsx
@@ -329,7 +329,7 @@ export default function Profile() {
           <Card title="个人信息">
             <Space orientation="vertical" size={18} style={{ width: '100%' }}>
               <div style={{ textAlign: 'center' }}>
-                <Avatar size={112} src={user.avatar || defaultAvatar} />
+                <Avatar size={112} src={user.avatarUrl || defaultAvatar} />
                 <div style={{ marginTop: 12 }}>
                   <Upload {...uploadProps}>
                     <Button icon={<UploadOutlined />} loading={avatarUploading}>
diff --git a/src/stores/userStore.ts b/src/stores/userStore.ts
index 3982d065..4b364919 100644
--- a/src/stores/userStore.ts
+++ b/src/stores/userStore.ts
@@ -17,7 +17,7 @@ export const useUserStore = create<UserState>(set => ({
             ...userInfo,
             user: {
               ...userInfo.user,
-              avatar: userInfo.user.avatar || defaultAvatar
+              avatarUrl: userInfo.user.avatarUrl || defaultAvatar
             }
           }
         : undefined