Squashed commit of the following:

commit 5fdc85adae
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 019f62ea84
Author: pref_mail@163.com <123456>
Date:   Sun Jun 25 13:57:03 2023 +0800

    修改地图插件问题

commit 90be2b3038
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 eb05df91e1
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

@@ -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";