From b3383d96db5b39e03edfece495572a3120edcd61 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 12 十月 2026 13:14:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/api/system/user/index.ts |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 208d4b9..7491b84 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -26,6 +26,13 @@
   export interface UserSimple extends User {
     id: number;
   }
+
+  /** 鐢ㄦ埛瀵煎叆缁撴灉 */
+  export interface UserImportRespVO {
+    createUsernames?: string[]; // 鏂板鎴愬姛鐨勭敤鎴峰悕
+    updateUsernames?: string[]; // 鏇存柊鎴愬姛鐨勭敤鎴峰悕
+    failureUsernames?: Record<string, string>; // 瀵煎叆澶辫触鐨勭敤鎴峰悕鍙婂師鍥�
+  }
 }
 
 /** 鏌ヨ鐢ㄦ埛绠$悊鍒楄〃 */
@@ -80,10 +87,13 @@
 
 /** 瀵煎叆鐢ㄦ埛 */
 export function importUser(file: File, updateSupport: boolean) {
-  return requestClient.upload('/system/user/import', {
-    file,
-    updateSupport,
-  });
+  return requestClient.upload<SystemUserApi.UserImportRespVO>(
+    '/system/user/import',
+    {
+      file,
+      updateSupport,
+    },
+  );
 }
 
 /** 鐢ㄦ埛瀵嗙爜閲嶇疆 */

--
Gitblit v1.9.3