From 6b5ab74fcb869f49f07963bbae45f62462233dda Mon Sep 17 00:00:00 2001
From: zhangsiyu <q3183592900@qq.com>
Date: Sun, 25 Jun 2023 18:06:27 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 5fdc85adae9348c030902c04d3c5ea691e0e9ad8
Merge: 019f62e 90be2b3
Author: pref_mail@163.com <123456>
Date:   Sun Jun 25 13:58:38 2023 +0800

    Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

commit 019f62ea84bc8cfcaa25844bfe08bc1007d36f70
Author: pref_mail@163.com <123456>
Date:   Sun Jun 25 13:57:03 2023 +0800

    修改地图插件问题

commit 90be2b30388806f3356bc41155d2ef630c7dc38b
Merge: eb05df9 3c44f6d
Author: caoyizhong <1270296080@qq.com>
Date:   Sun Jun 25 13:37:24 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit eb05df91e104ded78614e65bf6e6fde0e222b3da
Author: caoyizhong <1270296080@qq.com>
Date:   Sun Jun 25 13:37:18 2023 +0800

    修改客户信息

# Conflicts:
#	src/views/distribution/delivery/distributionDelivery.vue

# Conflicts:
#	src/views/distribution/delivery/distributionDelivery.vue
---
 src/views/distribution/delivery/distributionDelivery.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/distribution/delivery/distributionDelivery.vue b/src/views/distribution/delivery/distributionDelivery.vue
index 16412cb2..50767dc5 100644
--- a/src/views/distribution/delivery/distributionDelivery.vue
+++ b/src/views/distribution/delivery/distributionDelivery.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script>
-import { addDelivery, getDetailDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
+import { getDetailDelivery, addDelivery, updateDelivery, removeDelivery } from "@/api/distribution/distributionDelivery";
 import option from "@/option/distribution/distributionDelivery";
 import { mapGetters } from "vuex";