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

---
 .eslintrc-auto-import.json |   69 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 0a73595..22e3138 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -5,7 +5,6 @@
     "AreaType": true,
     "AuthorizeType": true,
     "BooleanOptions": true,
-    "CallingConventions": true,
     "CategoryCode": true,
     "CertificateTypeCodeEnum": true,
     "ChargeTypeEnum": true,
@@ -26,9 +25,42 @@
     "EnumBillingMethodUnitText": true,
     "EnumClientType": true,
     "EnumClientTypeText": true,
+    "EnumCodeUrlScene": true,
+    "EnumContractTemplateStatus": true,
+    "EnumContractTemplateStatusText": true,
+    "EnumContractTemplateStatusTextForEnterpriseFilter": true,
+    "EnumContractTemplateValueRecorder": true,
+    "EnumContractTemplateValueRecorderText": true,
+    "EnumContractTemplateValueType": true,
+    "EnumContractTemplateValueTypeText": true,
+    "EnumDataSource": true,
+    "EnumDbAuditOperate": true,
+    "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,
     "EnumRealAccessText": true,
     "EnumResourceController": true,
@@ -40,22 +72,33 @@
     "EnumSettlementCycleText": true,
     "EnumSmsAccess": true,
     "EnumSmsAccessText": true,
-    "EnumSmsTemplateType": true,
     "EnumTaskCheckReceiveStatus": true,
+    "EnumTaskCheckReceiveStatusText": true,
     "EnumTaskRecommendStatus": true,
     "EnumTaskRecommendStatusText": true,
     "EnumTaskReleaseStatus": true,
     "EnumTaskReleaseStatusText": true,
+    "EnumTaskSettlementOrderStatus": true,
     "EnumTaskSettlementStatus": true,
+    "EnumTaskSettlementStatusText": true,
     "EnumTaskStatus": true,
     "EnumTaskStatusText": true,
+    "EnumTaskUserArrangeStatus": true,
+    "EnumTaskUserHireStatus": true,
+    "EnumTaskUserHireStatusText": true,
+    "EnumTaskUserSignContractStatus": true,
+    "EnumTaskUserSignContractStatusText": true,
+    "EnumTaskUserSubmitCheckReceiveStatus": true,
     "EnumUserGender": true,
     "EnumUserGenderText": true,
+    "EnumUserGenderTextForPerson": true,
     "EnumUserInfoStatusText": true,
+    "EnumUserRealMethod": true,
     "EnumUserStatus": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
-    "EventAttributes": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumWalletTransactionStatus": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
@@ -64,7 +107,6 @@
     "FastColumnList": true,
     "FastDataButtonList": true,
     "FastPageButtonList": true,
-    "FieldAttributes": true,
     "FlexEnterpriseCertificationStatus": true,
     "FlexEnterpriseCertificationStatusText": true,
     "FlexTaskWorkerHireEnum": true,
@@ -73,7 +115,10 @@
     "FlexWorkerEleSignEnumText": true,
     "Gender": true,
     "GenderText": true,
-    "GenericParameterAttributes": true,
+    "GetPersonalApplyTaskInfosQueryStatus": true,
+    "GetPersonalHireTaskInfosQueryStatus": true,
+    "GetTaskInfoQueryResultApplyButton": true,
+    "GetTaskInfoQueryResultHireButton": true,
     "GlobalEvent": true,
     "GlobalEventContext": true,
     "GlobalEventListener": true,
@@ -81,13 +126,9 @@
     "InjectionKey": true,
     "IsConfiguredText": true,
     "IsRealText": true,
-    "LayoutKind": true,
     "MaybeRef": true,
     "MaybeRefOrGetter": true,
-    "MemberTypes": true,
     "MenuSvgIconMap": true,
-    "MethodAttributes": true,
-    "MethodImplAttributes": true,
     "ModuleColumns": true,
     "MyRegExp": true,
     "OSSBaseURL": true,
@@ -103,24 +144,20 @@
     "OssRich": true,
     "OssUser": true,
     "OssUserSign": true,
-    "ParameterAttributes": true,
     "PropType": true,
-    "PropertyAttributes": true,
     "Ref": true,
     "RoleClientType": true,
-    "SecurityRuleSet": true,
     "Slot": true,
     "Slots": true,
     "SubModuleKey": true,
     "SubModuleTitle": true,
     "SubModuleType": true,
-    "TaskCreationOptions": true,
-    "TaskStatus": true,
+    "TempFolderPath": true,
+    "TemplateEditDataItem": true,
     "ThemeColorItem": true,
     "ThemeColorName": true,
     "ThemeColors": true,
     "ThemeColorsType": true,
-    "TypeAttributes": true,
     "UsePortraitTableColumnsItem": true,
     "UsePortraitTableOptions": true,
     "VNode": true,
@@ -202,6 +239,7 @@
     "useCssModule": true,
     "useCssVars": true,
     "useDictionaryDataSelect": true,
+    "useEnabledElectronSignSettings": true,
     "useGetDictionaryCategorySelect": true,
     "useGlobalEventContext": true,
     "useGlobalEventProvide": true,
@@ -216,6 +254,7 @@
     "useModel": true,
     "useOmit": true,
     "useOmitProps": true,
+    "useOpenLogDialog": true,
     "usePortraitTable": true,
     "usePortraitTableWithAttachment": true,
     "useResizeHander": true,

--
Gitblit v1.9.1