From 81adf03a60f6b4452be4e3ad1f9e3915e0c78bf6 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 17 九月 2025 17:25:00 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1

---
 src/services/api/typings.d.ts |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index f72be6c..bde91c4 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -900,6 +900,10 @@
     InProcess = 20,
     /**宸茬粨绠� */
     Completed = 30,
+    /**閮ㄥ垎缁撶畻 */
+    Part = 40,
+    /**缁撶畻澶辫触 */
+    Fail = 50,
   }
 
   enum EnumTaskStatus {
@@ -3286,6 +3290,7 @@
     enterpriseSignContractTime?: string;
     /** 鐢靛瓙鍚堝悓 */
     contractUrl?: string;
+    createdTime?: string;
   }
 
   type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -4123,6 +4128,8 @@
     /** 鍒涘缓鏃堕棿-鎴 */
     createdTimeEnd?: string;
     type?: EnumUserWalletTransactionType;
+    /** 鐢ㄦ埛Id */
+    userId?: string;
     pageModel?: PagedListQueryPageModel;
   }
 
@@ -4145,6 +4152,13 @@
     balance?: number;
     /** 浼佷笟鍚嶇О */
     enterpriseName?: string;
+    /** 浠诲姟鍚嶇О */
+    taskName?: string;
+    /** 缁撶畻鍗曞悕绉� */
+    settlementOrderName?: string;
+    settlementStatus?: EnumTaskSettlementStatus;
+    /** 缁撶畻鏃堕棿 */
+    settlementTime?: string;
     /** 浠樻浜鸿处鎴� */
     payerAccount?: string;
     /** 浠樻浜哄悕绉� */
@@ -4185,6 +4199,12 @@
   }
 
   interface GetPersonalUserWalletBalancesQueryResult {
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetPersonalUserWalletBalancesQueryResultItem[];
+  }
+
+  interface GetPersonalUserWalletBalancesQueryResultItem {
     /** 鐢ㄦ埛Id */
     id?: string;
     /** 濮撳悕 */
@@ -4195,12 +4215,7 @@
     identity?: string;
     /** 浣欓 */
     balance?: number;
-    pageModel?: PagedListQueryResultPageModel;
-    /** 鏁版嵁 */
-    data?: GetPersonalUserWalletBalancesQueryResultItem[];
   }
-
-  type GetPersonalUserWalletBalancesQueryResultItem = Record<string, any>;
 
   interface GetResourceFieldsQueryResultItem {
     /** 缂栧彿 */
@@ -4467,7 +4482,6 @@
     identity?: string;
     /** 鎵嬫満鍙� */
     contactPhoneNumber?: string;
-    settlementStatus?: EnumTaskSettlementStatus;
     /** 鎵�灞為摱琛� */
     bank?: string;
     /** 寮�鎴锋敮琛屽悕绉� */
@@ -4478,6 +4492,8 @@
     settlementAmount?: number;
     /** 瀹炲彂閲戦 */
     actualSettlementAmount?: number;
+    settlementReceiveStatus?: SettlementReceiveStatus;
+    settlementStatus?: EnumTaskSettlementStatus;
     /** 缁撶畻鏃堕棿 */
     settlementTime?: string;
   }
@@ -5108,18 +5124,18 @@
     name?: string;
     /** 韬唤璇佸彿 */
     identity?: string;
-    /** 缁撶畻閲戦 */
-    settlementAmount?: number;
-    /** 瀹炲彂閲戦 */
-    actualSettlementAmount?: number;
-    /** 鏀舵璐︽埛 */
-    receiveAccount?: string;
+    /** 鎵嬫満鍙� */
+    contactPhoneNumber?: string;
     /** 鎵�灞為摱琛� */
     bank?: string;
     /** 寮�鎴锋敮琛屽悕绉� */
     bankBranch?: string;
-    /** 浠诲姟鍚嶇О */
-    taskName?: string;
+    /** 鏀舵璐︽埛 */
+    receiveAccount?: string;
+    /** 缁撶畻閲戦 */
+    settlementAmount?: number;
+    /** 瀹炲彂閲戦 */
+    actualSettlementAmount?: number;
   }
 
   interface InviteElectronSignCommand {
@@ -5816,6 +5832,13 @@
     hireStatus?: EnumTaskUserHireStatus;
   }
 
+  enum SettlementReceiveStatus {
+    /**宸插埌璐� */
+    Completed = 10,
+    /**宸查��娆� */
+    Refunded = 20,
+  }
+
   interface SetUserInfoRolesCommand {
     /** 鐢ㄦ埛Id */
     userInfoId?: string;

--
Gitblit v1.9.1