diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue
index b2c09e1e..f51968e2 100644
--- a/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue
+++ b/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue
@@ -50,8 +50,6 @@ export default {
             })
         },
         initCesium() {
-<<<<<<< Updated upstream
-=======
             window.api = new SAPI(
                 {
                     serverIP: `model.jhncidg.com`, //服务ip地址
@@ -98,7 +96,6 @@ export default {
       );
     },
         initCesium2() {
->>>>>>> Stashed changes
             // const defaults = { ...this.bimStore.defaults }
             let defaults = {
                 container: 'cesiumContainer', //[必须]容器id