From 0ae2f2f277c9a20648e2b53a804b443e412b523a Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 10 十月 2025 13:32:51 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.1.2

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

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 4dc8632..58b65b5 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -1,5 +1,6 @@
 {
   "globals": {
+    "AlipayExpandindirectSceneList": true,
     "AppLocalConfig": true,
     "AppType": true,
     "AreaType": true,
@@ -25,6 +26,9 @@
     "EnumBillingMethodUnitText": true,
     "EnumClientType": true,
     "EnumClientTypeText": true,
+    "EnumCodeUrlScene": true,
+    "EnumConsoleLogAccess": true,
+    "EnumConsoleLogAccessText": true,
     "EnumContractTemplateStatus": true,
     "EnumContractTemplateStatusText": true,
     "EnumContractTemplateStatusTextForEnterpriseFilter": true,
@@ -37,33 +41,59 @@
     "EnumDbAuditOperateText": true,
     "EnumElectronSignAccess": true,
     "EnumElectronSignAccessText": true,
+    "EnumElectronSignVerifyType": true,
+    "EnumEnterpriseCostStatus": true,
+    "EnumEnterpriseCostType": true,
     "EnumEnterpriseRealMethod": true,
+    "EnumEnterpriseWalletAccess": true,
+    "EnumEnterpriseWalletExpandindirectOrderFileType": true,
+    "EnumEnterpriseWalletExpandindirectOrderScene": true,
+    "EnumEnterpriseWalletExpandindirectOrderSceneText": true,
+    "EnumEnterpriseWalletExpandindirectOrderStatus": true,
+    "EnumEnterpriseWalletExpandindirectOrderStatusText": true,
+    "EnumEnterpriseWalletSignStatus": true,
+    "EnumEnterpriseWalletSignStatusText": true,
+    "EnumEnterpriseWalletTransactionType": true,
+    "EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
+    "EnumLogLevel": true,
+    "EnumLogLevelText": true,
     "EnumMenuType": true,
     "EnumMenuVisitLevel": true,
     "EnumOcrAccess": true,
     "EnumPagedListOrder": true,
     "EnumPayAccess": true,
     "EnumPersonalFreeTime": true,
+    "EnumPersonalFreeTimeText": true,
     "EnumPersonalJobSeekingStatus": true,
+    "EnumPersonalJobSeekingStatusText": true,
     "EnumPersonalRealMethod": true,
     "EnumPersonalUserRealStatus": true,
     "EnumRealAccess": true,
     "EnumRealAccessText": true,
     "EnumResourceController": true,
     "EnumResourceMethod": true,
+    "EnumResourceMethodText": true,
     "EnumRoleWebApiDataPower": true,
     "EnumRoleWebApiDataPowerText": true,
     "EnumRoleWebApiDataPowerTextForFilter": true,
     "EnumSettlementCycle": true,
+    "EnumSettlementCycleDateMonthArray": true,
+    "EnumSettlementCycleDateText": true,
+    "EnumSettlementCycleDateWeekArray": true,
     "EnumSettlementCycleText": true,
     "EnumSmsAccess": true,
     "EnumSmsAccessText": true,
+    "EnumSmsAccessTextUseInLogs": true,
+    "EnumSmsAccessTextUseInSms": true,
+    "EnumSmsStatus": true,
+    "EnumSmsStatusText": true,
     "EnumTaskCheckReceiveStatus": true,
     "EnumTaskCheckReceiveStatusText": true,
     "EnumTaskRecommendStatus": true,
     "EnumTaskRecommendStatusText": true,
     "EnumTaskReleaseStatus": true,
     "EnumTaskReleaseStatusText": true,
+    "EnumTaskSettlementOrderStatus": true,
     "EnumTaskSettlementStatus": true,
     "EnumTaskSettlementStatusText": true,
     "EnumTaskStatus": true,
@@ -74,6 +104,7 @@
     "EnumTaskUserSignContractStatus": true,
     "EnumTaskUserSignContractStatusText": true,
     "EnumTaskUserSubmitCheckReceiveStatus": true,
+    "EnumUserBankCardAccess": true,
     "EnumUserGender": true,
     "EnumUserGenderText": true,
     "EnumUserGenderTextForPerson": true,
@@ -82,6 +113,10 @@
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumUserWalletTransactionTypeText": true,
+    "EnumWalletTransactionStatus": true,
+    "EnumWalletTransactionStatusText": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
@@ -130,11 +165,14 @@
     "PropType": true,
     "Ref": true,
     "RoleClientType": true,
+    "SettlementReceiveStatus": true,
+    "SettlementReceiveStatusText": true,
     "Slot": true,
     "Slots": true,
     "SubModuleKey": true,
     "SubModuleTitle": true,
     "SubModuleType": true,
+    "TempFolderPath": true,
     "TemplateEditDataItem": true,
     "ThemeColorItem": true,
     "ThemeColorName": true,
@@ -221,6 +259,7 @@
     "useCssModule": true,
     "useCssVars": true,
     "useDictionaryDataSelect": true,
+    "useEnabledElectronSignSettings": true,
     "useGetDictionaryCategorySelect": true,
     "useGlobalEventContext": true,
     "useGlobalEventProvide": true,

--
Gitblit v1.9.1