Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-04-28 10:06:29 +08:00
parent ecdca981b0 ca94ca906f
commit 50d028f6b8
93 changed files with 1353 additions and 1156 deletions
--- a/packages/@core/base/shared/src/utils/inference.ts
+++ b/packages/@core/base/shared/src/utils/inference.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line vue/prefer-import-from-vue
 import { isFunction, isObject, isString } from '@vue/shared';

 /**