From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/wms/md/merchant/index.vue | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/views/wms/md/merchant/index.vue b/src/views/wms/md/merchant/index.vue
index 69b55b1..b73dd3c 100644
--- a/src/views/wms/md/merchant/index.vue
+++ b/src/views/wms/md/merchant/index.vue
@@ -2,8 +2,8 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { WmsMerchantApi } from '#/api/wms/md/merchant';
-import { DocAlert, Page, useVbenModal } from '..\..\..\..\packages\effects\common-ui\src';
-import { downloadFileFromBlobPart } from '..\..\..\..\packages\utils\src';
+import { Page, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -93,15 +93,7 @@
</script>
<template>
- <Page auto-content-height>
- <template #doc>
- <DocAlert
- title="銆愬熀纭�銆戝線鏉ヤ紒涓氾紙渚涘簲鍟嗐�佸鎴凤級"
- url="https://doc.iocoder.cn/wms/md/merchant/"
- />
- </template>
-
- <FormModal @success="handleRefresh" />
+ <Page auto-content-height><FormModal @success="handleRefresh" />
<Grid table-title="寰�鏉ヤ紒涓氬垪琛�">
<template #toolbar-tools>
<TableAction
--
Gitblit v1.9.3