From b331f884097a2dc5086c8cf043c8c8f52e7640fe Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:34:39 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1

---
 .eslintrc-auto-import.json |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 76dc90d..58af739 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -31,11 +31,11 @@
     "EnumEnterpriseCostType": true,
     "EnumEnterpriseRealMethod": true,
     "EnumEnterpriseWalletAccess": true,
+    "EnumEnterpriseWalletAccessText": true,
     "EnumEnterpriseWalletExpandindirectOrderFileType": true,
     "EnumEnterpriseWalletExpandindirectOrderScene": true,
     "EnumEnterpriseWalletExpandindirectOrderStatus": true,
     "EnumEnterpriseWalletSignStatus": true,
-    "EnumEnterpriseWalletTransactionStatus": true,
     "EnumEnterpriseWalletTransactionType": true,
     "EnumMenuType": true,
     "EnumMenuVisitLevel": true,
@@ -43,7 +43,9 @@
     "EnumPagedListOrder": true,
     "EnumPayAccess": true,
     "EnumPersonalFreeTime": true,
+    "EnumPersonalFreeTimeText": true,
     "EnumPersonalJobSeekingStatus": true,
+    "EnumPersonalJobSeekingStatusText": true,
     "EnumPersonalRealMethod": true,
     "EnumPersonalUserRealStatus": true,
     "EnumRealAccess": true,
@@ -53,6 +55,7 @@
     "EnumRoleWebApiDataPowerText": true,
     "EnumRoleWebApiDataPowerTextForFilter": true,
     "EnumSettlementCycle": true,
+    "EnumSettlementCycleDateText": true,
     "EnumSettlementCycleText": true,
     "EnumSmsAccess": true,
     "EnumTaskCheckReceiveStatus": true,
@@ -85,6 +88,8 @@
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumWalletTransactionStatus": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,

--
Gitblit v1.9.1