From babc319b498f6b5f08ffe2594c33e5aafaea30ae Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 17 十月 2025 18:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.2.0.1

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

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 7afcca3..e68d804 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -5,6 +5,7 @@
     "AreaType": true,
     "CategoryCode": true,
     "CertificateTypeCodeEnum": true,
+    "CommonAnnexTableColumns": true,
     "Component": true,
     "ComponentPublicInstance": true,
     "ComputedRef": true,
@@ -19,6 +20,8 @@
     "EnumBillingMethodUnitText": true,
     "EnumClientType": true,
     "EnumClientTypeText": true,
+    "EnumCodeUrlScene": true,
+    "EnumConsoleLogAccess": true,
     "EnumContractTemplateStatus": true,
     "EnumContractTemplateStatusText": true,
     "EnumContractTemplateValueRecorder": true,
@@ -26,23 +29,30 @@
     "EnumDataSource": true,
     "EnumDbAuditOperate": true,
     "EnumElectronSignAccess": true,
+    "EnumElectronSignVerifyType": true,
     "EnumEnterpriseCostStatus": true,
     "EnumEnterpriseCostType": true,
     "EnumEnterpriseRealMethod": true,
     "EnumEnterpriseWalletAccess": true,
+    "EnumEnterpriseWalletAccessText": true,
+    "EnumEnterpriseWalletAccessTextForSettle": true,
+    "EnumEnterpriseWalletAccessTextOnlyAlipay": true,
     "EnumEnterpriseWalletExpandindirectOrderFileType": true,
     "EnumEnterpriseWalletExpandindirectOrderScene": true,
     "EnumEnterpriseWalletExpandindirectOrderStatus": true,
     "EnumEnterpriseWalletSignStatus": true,
-    "EnumEnterpriseWalletTransactionStatus": true,
     "EnumEnterpriseWalletTransactionType": true,
+    "EnumGetEnterpriseEmployeesQuerySignContractStatus": true,
+    "EnumLogLevel": 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,
@@ -52,10 +62,18 @@
     "EnumRoleWebApiDataPowerText": true,
     "EnumRoleWebApiDataPowerTextForFilter": true,
     "EnumSettlementCycle": true,
+    "EnumSettlementCycleDateMonthArray": true,
+    "EnumSettlementCycleDateText": true,
+    "EnumSettlementCycleDateUnitText": true,
+    "EnumSettlementCycleDateWeekArray": true,
     "EnumSettlementCycleText": true,
     "EnumSmsAccess": true,
+    "EnumSmsStatus": true,
+    "EnumTaskCheckReceiveMethod": true,
     "EnumTaskCheckReceiveStatus": true,
     "EnumTaskCheckReceiveStatusText": true,
+    "EnumTaskCheckReceiveStatusTextForFilter": true,
+    "EnumTaskPaymentMethod": true,
     "EnumTaskRecommendStatus": true,
     "EnumTaskRecommendStatusText": true,
     "EnumTaskReleaseStatus": true,
@@ -76,14 +94,31 @@
     "EnumTaskUserSignContractStatusTextForFilter": true,
     "EnumTaskUserSubmitCheckReceiveStatus": true,
     "EnumTaskUserSubmitCheckReceiveStatusText": true,
+    "EnumUserBankCardAccess": true,
     "EnumUserGender": true,
     "EnumUserGenderText": true,
     "EnumUserGenderTextForEdit": true,
     "EnumUserGenderTextForPerson": true,
     "EnumUserRealMethod": true,
     "EnumUserStatus": true,
+    "EnumUserStatusText": true,
     "EnumUserType": true,
     "EnumUserTypeText": true,
+    "EnumUserWalletTransactionType": true,
+    "EnumUserWalletTransactionTypeText": true,
+    "EnumWalletTransactionStatus": true,
+    "EnumWalletTransactionStatusText": true,
+    "EnumWeChatPayApplymentBankAccountType": true,
+    "EnumWeChatPayApplymentCertType": true,
+    "EnumWeChatPayApplymentContactType": true,
+    "EnumWeChatPayApplymentFinanceType": true,
+    "EnumWeChatPayApplymentIdDocType": true,
+    "EnumWeChatPayApplymentIdHolderType": true,
+    "EnumWeChatPayApplymentSalesScenesType": true,
+    "EnumWeChatPayApplymentState": true,
+    "EnumWeChatPayApplymentSubjectType": true,
+    "EnumWeChatPaySettlementModifyVerifyResult": true,
+    "EnumWeChatPaySettlementVerifyResult": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
@@ -122,6 +157,8 @@
     "OssUserSign": true,
     "PropType": true,
     "Ref": true,
+    "SettlementReceiveStatus": true,
+    "SettlementReceiveStatusText": true,
     "Slot": true,
     "Slots": true,
     "SubModuleKey": true,
@@ -133,6 +170,8 @@
     "ThemeColorName": true,
     "ThemeColors": true,
     "ThemeColorsType": true,
+    "UsePortraitTableColumnsItem": true,
+    "UsePortraitTableOptions": true,
     "VNode": true,
     "WelfareCodeEnum": true,
     "WritableComputedRef": true,
@@ -209,6 +248,7 @@
     "useCssVars": true,
     "useDictionaryDataSelect": true,
     "useEnterpriseContractTemplateSelect": true,
+    "useEnterpriseWalletAccessSelect": true,
     "useGetDictionaryCategorySelect": true,
     "useGlobalEventContext": true,
     "useGlobalEventProvide": true,
@@ -222,14 +262,18 @@
     "useModel": true,
     "useOmit": true,
     "useOmitProps": true,
+    "usePortraitTable": true,
+    "usePortraitTableWithAttachment": true,
     "useResizeHander": true,
     "useRoute": true,
     "useRouteView": true,
     "useRouter": true,
     "useSetReactive": true,
     "useSlots": true,
+    "useTaskSelect": true,
     "useTemplateRef": true,
     "useUser": true,
+    "useUserInfoRoles": true,
     "useVModel": true,
     "useVModels": true,
     "watch": true,

--
Gitblit v1.9.1