Merge remote-tracking branch 'origin/feature/0707_产品权限' into feature/v1.3_营销资产中台

# Conflicts: # config/unplugin/auto-import.ts
2025-07-09 16:56:00 +08:00
parent 24d942acfe 2a6eb17bb9
commit 003b5d82b0
25 changed files with 427 additions and 211 deletions
--- a/config/unplugin/auto-import.ts
+++ b/config/unplugin/auto-import.ts
@ -21,7 +21,7 @@ export function configAutoImport() {
      '@vueuse/core',
      {
        dayjs: [['default', 'dayjs']],
-        'lodash-es': ['cloneDeep', 'omit', 'pick', 'union', 'isNumber', 'isEmpty'],
+        'lodash-es': ['cloneDeep', 'omit', 'pick', 'union', 'uniq', 'isNumber', 'uniqBy', 'isEmpty'],
        '@/hooks': ['useModal'],
      },
    ],