diff --git a/src/views/baseapi/file/upload/FileUploadInfo.vue b/src/views/baseapi/file/upload/FileUploadInfo.vue
index 1e770b9c4..1f05e1ef3 100644
--- a/src/views/baseapi/file/upload/FileUploadInfo.vue
+++ b/src/views/baseapi/file/upload/FileUploadInfo.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script setup lang="ts">
-  import BasicModal from '/@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import { DescItem, Description } from '@/components/Description'
   import { downloadFile, get, UpdateFileInfo } from './FileUpload.api'
   import { ref } from 'vue'
diff --git a/src/views/baseapi/log/login/LoginLogInfo.vue b/src/views/baseapi/log/login/LoginLogInfo.vue
index 13ef744ef..f9d95bd9e 100644
--- a/src/views/baseapi/log/login/LoginLogInfo.vue
+++ b/src/views/baseapi/log/login/LoginLogInfo.vue
@@ -18,7 +18,7 @@
   import { Description, DescItem } from '@/components/Description'
   import { get, LoginLog } from './LoginLog.api'
 
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import { findOneByField } from '@/utils/dataUtil'
   import { Client, findAll } from '@/views/iam/client/Client.api'
   import { onMounted, ref } from 'vue'
diff --git a/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue b/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue
index 4b3004a07..9c5d28c46 100644
--- a/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue
+++ b/src/views/daxpay/admin/isv/gateway/GatewayConfigModel.vue
@@ -37,7 +37,7 @@
   import AggregateQrConfigForm from './aggregate/AggregateQrConfigForm.vue'
   import AggregateBarConfigForm from './aggregate/AggregateBarConfigForm.vue'
   import MiniQuicklyConfigForm from './quickly/MiniQuicklyConfigForm.vue'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import GatewayConfigEdit from './common/GatewayConfigEdit.vue'
 
   const visible = ref(false)
diff --git a/src/views/daxpay/admin/isv/info/IsvInfoEdit.vue b/src/views/daxpay/admin/isv/info/IsvInfoEdit.vue
index e824da464..b9a7ba1d1 100644
--- a/src/views/daxpay/admin/isv/info/IsvInfoEdit.vue
+++ b/src/views/daxpay/admin/isv/info/IsvInfoEdit.vue
@@ -61,7 +61,7 @@
   import { add, get, IsvInfo, update } from './IsvInfo.api'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '@/enums/formTypeEnum'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
 
   const {
     initFormEditType,
diff --git a/src/views/daxpay/admin/merchant/user/UserResetPwd.vue b/src/views/daxpay/admin/merchant/user/UserResetPwd.vue
index 5bb0c441d..080e745d6 100644
--- a/src/views/daxpay/admin/merchant/user/UserResetPwd.vue
+++ b/src/views/daxpay/admin/merchant/user/UserResetPwd.vue
@@ -26,7 +26,7 @@
   </basic-modal>
 </template>
 <script setup lang="ts">
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { restartPassword, restartPasswordBatch } from './MerchantUser.api'
   import { useMessage } from '@/hooks/web/useMessage'
diff --git a/src/views/daxpay/admin/merchant/user/UserShow.vue b/src/views/daxpay/admin/merchant/user/UserShow.vue
index ea1694de6..0473f07ef 100644
--- a/src/views/daxpay/admin/merchant/user/UserShow.vue
+++ b/src/views/daxpay/admin/merchant/user/UserShow.vue
@@ -45,7 +45,7 @@
 
 <script lang="ts" setup>
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import { get } from './MerchantUser.api'
   import { useDict } from '@/hooks/bootx/useDict'
   import { ref } from 'vue'
diff --git a/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue b/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
index 94fd82737..fe4d9009a 100644
--- a/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
+++ b/src/views/daxpay/common/device/terminal/TerminalDeviceEdit.vue
@@ -128,7 +128,7 @@
   import { FormEditType } from '@/enums/formTypeEnum'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { useDict } from '@/hooks/bootx/useDict'
-  import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import { Cascader } from 'ant-design-vue'
   import { findAllProvinceAndCityAndArea, Region } from '@/api/common/ChinaRegion.api'
   import { cloneDeep } from 'lodash-es'
diff --git a/src/views/daxpay/common/device/terminal/channel/ChannelTerminalCommEdit.vue b/src/views/daxpay/common/device/terminal/channel/ChannelTerminalCommEdit.vue
index d61d138e5..efa124a62 100644
--- a/src/views/daxpay/common/device/terminal/channel/ChannelTerminalCommEdit.vue
+++ b/src/views/daxpay/common/device/terminal/channel/ChannelTerminalCommEdit.vue
@@ -66,7 +66,7 @@
 
 <script setup lang="ts">
   import { computed, nextTick, ref } from 'vue'
-  import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { Rule } from 'ant-design-vue/lib/form'
   import { ChannelTerminal, update, get } from './ChannelTerminal.api'
diff --git a/src/views/daxpay/common/merchant/credential/MerchantCredentialConfig.vue b/src/views/daxpay/common/merchant/credential/MerchantCredentialConfig.vue
index 41bed4b28..a84c82982 100644
--- a/src/views/daxpay/common/merchant/credential/MerchantCredentialConfig.vue
+++ b/src/views/daxpay/common/merchant/credential/MerchantCredentialConfig.vue
@@ -64,7 +64,7 @@
   import { nextTick, ref } from 'vue'
   import { FormInstance } from 'ant-design-vue'
   import { findByMchNo, update, MerchantCredential } from './MerchantCredential.api'
-  import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { useMessage } from '@/hooks/web/useMessage'
   import { buildUUID } from '@/utils/uuid'
diff --git a/src/views/daxpay/common/merchant/gateway/GatewayConfigModel.vue b/src/views/daxpay/common/merchant/gateway/GatewayConfigModel.vue
index 4693cadbe..4402661c1 100644
--- a/src/views/daxpay/common/merchant/gateway/GatewayConfigModel.vue
+++ b/src/views/daxpay/common/merchant/gateway/GatewayConfigModel.vue
@@ -47,7 +47,7 @@
   import AggregateBarConfigForm from './aggregate/AggregateBarConfigForm.vue'
   import CashierCodeConfigForm from './cashier/CashierCodeConfigForm.vue'
   import CheckoutCounterConfigList from './checkout/CheckoutCounterConfigList.vue'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import { MchApp } from '@/views/daxpay/admin/merchant/app/MchAppAdmin.api'
   import { GatewayPayReadConfig } from './common/GatewayPayConfig.api'
   import GatewayPayReadConfigForm from './common/GatewayPayReadConfigForm.vue'
diff --git a/src/views/daxpay/common/notice/callback/CallbackRecordList.vue b/src/views/daxpay/common/notice/callback/CallbackRecordList.vue
index deedd240c..67a7fbc77 100644
--- a/src/views/daxpay/common/notice/callback/CallbackRecordList.vue
+++ b/src/views/daxpay/common/notice/callback/CallbackRecordList.vue
@@ -62,7 +62,7 @@
   import { nextTick, ref } from 'vue'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import { useDict } from '@/hooks/bootx/useDict'
   import { pageRecord, CallbackRecord } from './CallbackTask.api'
   import CallbackRecordInfo from './CallbackRecordInfo.vue'
diff --git a/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue b/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
index 1dd34ac38..6934eb4c9 100644
--- a/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
+++ b/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
@@ -79,7 +79,7 @@
   import { add, get, OnbMchInfo, update, existsByOnbMchNo } from './OnbMchInfo.api'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '@/enums/formTypeEnum'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import { useMessage } from '@/hooks/web/useMessage'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { dropdown as merchantDropdown } from '@/views/daxpay/common/assist/basic/MerchantQuery.api'
diff --git a/src/views/daxpay/common/order/pay/RefundModel.vue b/src/views/daxpay/common/order/pay/RefundModel.vue
index e2dae7705..6ec9a03d1 100644
--- a/src/views/daxpay/common/order/pay/RefundModel.vue
+++ b/src/views/daxpay/common/order/pay/RefundModel.vue
@@ -51,7 +51,7 @@
 <script lang="ts" setup>
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { refund } from '../refund/RefundOrder.api'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import { FormInstance } from 'ant-design-vue/lib/form'
   import { useMessage } from '@/hooks/web/useMessage'
   import { nextTick, ref } from 'vue'
diff --git a/src/views/daxpay/merchant/app/MchAppEdit.vue b/src/views/daxpay/merchant/app/MchAppEdit.vue
index 858aa4b22..960eb2dd0 100644
--- a/src/views/daxpay/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/merchant/app/MchAppEdit.vue
@@ -71,7 +71,7 @@
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { MchApp } from '@/views/daxpay/admin/merchant/app/MchAppAdmin.api'
-  import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
 
   const {
     initFormEditType,
diff --git a/src/views/iam/client/ClientEdit.vue b/src/views/iam/client/ClientEdit.vue
index c37bd69db..417289d64 100644
--- a/src/views/iam/client/ClientEdit.vue
+++ b/src/views/iam/client/ClientEdit.vue
@@ -62,7 +62,7 @@
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { useValidate } from '@/hooks/bootx/useValidate'
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
 
   const {
     initFormEditType,
diff --git a/src/views/iam/user/UserResetPwd.vue b/src/views/iam/user/UserResetPwd.vue
index bd0b13400..327cacb17 100644
--- a/src/views/iam/user/UserResetPwd.vue
+++ b/src/views/iam/user/UserResetPwd.vue
@@ -26,7 +26,7 @@
   </basic-modal>
 </template>
 <script setup lang="ts">
-  import BasicModal from '@/components/Modal/src/BasicModal.vue'
+  import { BasicModal } from '@/components/Modal'
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { restartPassword, restartPasswordBatch } from './User.api'
   import { useMessage } from '@/hooks/web/useMessage'
diff --git a/src/views/iam/user/UserShow.vue b/src/views/iam/user/UserShow.vue
index 6ad9c9732..182a959bd 100644
--- a/src/views/iam/user/UserShow.vue
+++ b/src/views/iam/user/UserShow.vue
@@ -49,7 +49,7 @@
 
 <script lang="ts" setup>
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
+  import { BasicDrawer } from '@/components/Drawer'
   import { get, UserInfo } from './User.api'
   import { getRoles } from './UserAssign.api'
   import { useDict } from '@/hooks/bootx/useDict'