From 79331c2f7b1fbaa2cc93a423033abae00305daf3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 25 九月 2025 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-v1.1.1
---
.eslintrc-auto-import.json | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index ab24bde..651a1ab 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,
@@ -41,24 +42,38 @@
"EnumEnterpriseCostType": true,
"EnumEnterpriseRealMethod": true,
"EnumEnterpriseWalletAccess": true,
+ "EnumEnterpriseWalletExpandindirectOrderFileType": true,
+ "EnumEnterpriseWalletExpandindirectOrderScene": true,
+ "EnumEnterpriseWalletExpandindirectOrderSceneText": true,
+ "EnumEnterpriseWalletExpandindirectOrderStatus": true,
+ "EnumEnterpriseWalletExpandindirectOrderStatusText": true,
"EnumEnterpriseWalletSignStatus": true,
+ "EnumEnterpriseWalletSignStatusText": true,
+ "EnumEnterpriseWalletTransactionType": true,
+ "EnumGetEnterpriseEmployeesQuerySignContractStatus": 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,
@@ -68,6 +83,7 @@
"EnumTaskRecommendStatusText": true,
"EnumTaskReleaseStatus": true,
"EnumTaskReleaseStatusText": true,
+ "EnumTaskSettlementOrderStatus": true,
"EnumTaskSettlementStatus": true,
"EnumTaskSettlementStatusText": true,
"EnumTaskStatus": true,
@@ -78,6 +94,7 @@
"EnumTaskUserSignContractStatus": true,
"EnumTaskUserSignContractStatusText": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
+ "EnumUserBankCardAccess": true,
"EnumUserGender": true,
"EnumUserGenderText": true,
"EnumUserGenderTextForPerson": true,
@@ -86,6 +103,10 @@
"EnumUserStatus": true,
"EnumUserType": true,
"EnumUserTypeText": true,
+ "EnumUserWalletTransactionType": true,
+ "EnumUserWalletTransactionTypeText": true,
+ "EnumWalletTransactionStatus": true,
+ "EnumWalletTransactionStatusText": true,
"ExtractDefaultPropTypes": true,
"ExtractPropTypes": true,
"ExtractPublicPropTypes": true,
@@ -134,11 +155,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,
--
Gitblit v1.9.1