From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/wms/md/merchant/data.ts |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/md/merchant/data.ts b/src/views/wms/md/merchant/data.ts
index a162b02..1fe9249 100644
--- a/src/views/wms/md/merchant/data.ts
+++ b/src/views/wms/md/merchant/data.ts
@@ -3,8 +3,8 @@
 
 import { h } from 'vue';
 
-import { DICT_TYPE, generateWmsCode } from '../../../../packages/constants/src';
-import { getDictOptions } from '../../../../packages/effects/hooks/src';
+import { DICT_TYPE, generateWmsCode } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 
 import { Button } from 'ant-design-vue';
 

--
Gitblit v1.9.3