From f393d0372b5ef06099a3591a4c77e61b48935a3b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 19 九月 2025 15:57:18 +0800
Subject: [PATCH] Merge branch 'dev-v1.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-v1.1

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

diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 5760c41..f83ceeb 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,
@@ -64,6 +65,7 @@
     "EnumSmsAccess": true,
     "EnumTaskCheckReceiveStatus": true,
     "EnumTaskCheckReceiveStatusText": true,
+    "EnumTaskCheckReceiveStatusTextForFilter": true,
     "EnumTaskRecommendStatus": true,
     "EnumTaskRecommendStatusText": true,
     "EnumTaskReleaseStatus": true,
@@ -93,7 +95,9 @@
     "EnumUserType": true,
     "EnumUserTypeText": true,
     "EnumUserWalletTransactionType": true,
+    "EnumUserWalletTransactionTypeText": true,
     "EnumWalletTransactionStatus": true,
+    "EnumWalletTransactionStatusText": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
@@ -132,6 +136,8 @@
     "OssUserSign": true,
     "PropType": true,
     "Ref": true,
+    "SettlementReceiveStatus": true,
+    "SettlementReceiveStatusText": true,
     "Slot": true,
     "Slots": true,
     "SubModuleKey": true,
@@ -143,6 +149,8 @@
     "ThemeColorName": true,
     "ThemeColors": true,
     "ThemeColorsType": true,
+    "UsePortraitTableColumnsItem": true,
+    "UsePortraitTableOptions": true,
     "VNode": true,
     "WelfareCodeEnum": true,
     "WritableComputedRef": true,
@@ -232,6 +240,8 @@
     "useModel": true,
     "useOmit": true,
     "useOmitProps": true,
+    "usePortraitTable": true,
+    "usePortraitTableWithAttachment": true,
     "useResizeHander": true,
     "useRoute": true,
     "useRouteView": true,

--
Gitblit v1.9.1