diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 789cc0d97..3a73e5b4c 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -206,11 +206,7 @@
             <template v-else-if="item.type == 'address'">
 
               <div class="address-item">
-<<<<<<< HEAD
                 <!-- <el-input class="address-item-input"
-=======
-                <el-input class="address-item-input"
->>>>>>> dev-九小场所1026
                           :placeholder="item.placeholder || '请输入所在地址'"
                           v-model="fmData[item.keyName]"
                           :maxlength="item.maxlength || ''"
@@ -221,7 +217,6 @@
                            type="default"
                            size="small"
                            ref="mapSearch"
-<<<<<<< HEAD
                            @click="handleSearchMap(item)">查询</el-button> -->
                 <el-select v-model="searchValue"
                            filterable
@@ -239,10 +234,6 @@
                   </el-option>
                 </el-select>
                 <div id="app_base"
-=======
-                           @click="handleSearchMap(item)">查询</el-button>
-                <div id="app"
->>>>>>> dev-九小场所1026
                      class="div_map"></div>
                 <div style="margin-top: 10px"
                      v-show="false">
@@ -649,7 +640,6 @@ export default {
       map.setMarker(latitude, longitude);
     },
 
-<<<<<<< HEAD
 
 
     async handleSearchMap (item) {
@@ -667,56 +657,6 @@ export default {
 
     async handleMoveCenter (item, e) {
       console.log("handleMoveCenter", e);
-=======
-    setMarker (lat, lng) {
-      markers.setGeometries([]);
-      markers.add([
-        {
-          id: "4",
-          styleId: "marker",
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: "marker4",
-          },
-        },
-      ]);
-    },
-
-    handleSearchMap (item) {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close();
-      });
-      infoWindowList.length = 0;
-      markers.setGeometries([]);
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchNearby({
-          keyword: this.fmData[item.keyName],
-          radius: 1000,
-          autoExtend: true,
-          center: map.getCenter(),
-        })
-        .then((result) => {
-          let { data } = result;
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng },
-            } = data[0];
-            map.setCenter(new TMap.LatLng(lat, lng));
-            this.setMarker(lat, lng);
-            // item.supValues[0] = lng;
-            // item.supValues[1] = lat;
-            this.fmData[item.supKeys[0]] = lng;
-            this.fmData[item.supKeys[1]] = lat;
-          } else {
-            this.$message.error("未检索到相关位置坐标");
-          }
-        });
-    },
-
-    handleMoveCenter (item, e) {
-      console.log(e);
->>>>>>> dev-九小场所1026
       //修改地图中心点
       const { lat, lng } = map.getCenter();
 
@@ -732,7 +672,6 @@ export default {
       }
     },
 
-<<<<<<< HEAD
     async remoteMethod (query) {
 
       if (query !== '') {
@@ -781,8 +720,6 @@ export default {
     },
 
 
-=======
->>>>>>> dev-九小场所1026
     async getInfo () {
       let url = this.infoUrl;
       if (!url) return;