From 728fdbfe0eae5b5b4ed186801ea9e96e8365ced7 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 | 4 +++-
 src/store/modules/user.ts    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index a6b97d5ef..c060d8709 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -36,7 +36,8 @@ export interface UserVO extends BaseEntity {
   email: string;
   phoneNumber: string;
   gender: string;
-  avatar: string;
+  avatar?: string | number;
+  avatarUrl?: string;
   status: string;
   delFlag: string;
   loginIp: string;
@@ -67,6 +68,7 @@ export interface UserForm {
   gender?: string;
   status: string;
   remark?: string;
+  avatar?: string | number;
   postIds: string[];
   roleIds: string[];
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 3167a7c4b..060a14be9 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -45,7 +45,7 @@ export const useUserStore = defineStore('user', () => {
         return Promise.reject(err);
       }
       const user = data.user;
-      const profile = user.avatar == '' || user.avatar == null ? defAva : user.avatar;
+      const profile = user.avatarUrl == '' || user.avatarUrl == null ? defAva : user.avatarUrl;
 
       if (data.roles && data.roles.length > 0) {
         // 验证返回的roles是否是一个非空数组