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 | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index a41a329..651a1ab 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -66,6 +66,7 @@
"EnumRealAccessText": true,
"EnumResourceController": true,
"EnumResourceMethod": true,
+ "EnumResourceMethodText": true,
"EnumRoleWebApiDataPower": true,
"EnumRoleWebApiDataPowerText": true,
"EnumRoleWebApiDataPowerTextForFilter": true,
@@ -93,6 +94,7 @@
"EnumTaskUserSignContractStatus": true,
"EnumTaskUserSignContractStatusText": true,
"EnumTaskUserSubmitCheckReceiveStatus": true,
+ "EnumUserBankCardAccess": true,
"EnumUserGender": true,
"EnumUserGenderText": true,
"EnumUserGenderTextForPerson": true,
@@ -102,7 +104,9 @@
"EnumUserType": true,
"EnumUserTypeText": true,
"EnumUserWalletTransactionType": true,
+ "EnumUserWalletTransactionTypeText": true,
"EnumWalletTransactionStatus": true,
+ "EnumWalletTransactionStatusText": true,
"ExtractDefaultPropTypes": true,
"ExtractPropTypes": true,
"ExtractPublicPropTypes": true,
@@ -151,6 +155,8 @@
"PropType": true,
"Ref": true,
"RoleClientType": true,
+ "SettlementReceiveStatus": true,
+ "SettlementReceiveStatusText": true,
"Slot": true,
"Slots": true,
"SubModuleKey": true,
--
Gitblit v1.9.1