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

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

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 4dc8632..22e3138 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -25,6 +25,7 @@
     "EnumBillingMethodUnitText": true,
     "EnumClientType": true,
     "EnumClientTypeText": true,
+    "EnumCodeUrlScene": true,
     "EnumContractTemplateStatus": true,
     "EnumContractTemplateStatusText": true,
     "EnumContractTemplateStatusTextForEnterpriseFilter": true,
@@ -37,14 +38,27 @@
     "EnumDbAuditOperateText": true,
     "EnumElectronSignAccess": true,
     "EnumElectronSignAccessText": 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,
     "EnumMenuType": true,
     "EnumMenuVisitLevel": true,
     "EnumOcrAccess": true,
     "EnumPagedListOrder": true,
     "EnumPayAccess": true,
     "EnumPersonalFreeTime": true,
+    "EnumPersonalFreeTimeText": true,
     "EnumPersonalJobSeekingStatus": true,
+    "EnumPersonalJobSeekingStatusText": true,
     "EnumPersonalRealMethod": true,
     "EnumPersonalUserRealStatus": true,
     "EnumRealAccess": true,
@@ -64,6 +78,7 @@
     "EnumTaskRecommendStatusText": true,
     "EnumTaskReleaseStatus": true,
     "EnumTaskReleaseStatusText": true,
+    "EnumTaskSettlementOrderStatus": true,
     "EnumTaskSettlementStatus": true,
     "EnumTaskSettlementStatusText": true,
     "EnumTaskStatus": true,
@@ -82,6 +97,8 @@
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumWalletTransactionStatus": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
@@ -135,6 +152,7 @@
     "SubModuleKey": true,
     "SubModuleTitle": true,
     "SubModuleType": true,
+    "TempFolderPath": true,
     "TemplateEditDataItem": true,
     "ThemeColorItem": true,
     "ThemeColorName": true,
@@ -221,6 +239,7 @@
     "useCssModule": true,
     "useCssVars": true,
     "useDictionaryDataSelect": true,
+    "useEnabledElectronSignSettings": true,
     "useGetDictionaryCategorySelect": true,
     "useGlobalEventContext": true,
     "useGlobalEventProvide": true,

--
Gitblit v1.9.1