From bfdc0e0e6d5e47aa501f9b6fadd143d9c97cf00a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 24 六月 2026 17:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/wms/md/merchant/components/select.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/wms/md/merchant/components/select.vue b/src/views/wms/md/merchant/components/select.vue
index 542c605..60f32c0 100644
--- a/src/views/wms/md/merchant/components/select.vue
+++ b/src/views/wms/md/merchant/components/select.vue
@@ -8,7 +8,7 @@
 import {
   CustomerMerchantTypeList,
   SupplierMerchantTypeList,
-} from '..\..\..\..\..\packages\constants\src';
+} from '../../../../../packages/constants/src';
 
 import { Select } from 'ant-design-vue';
 

--
Gitblit v1.9.3