diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 08a4811..d55e14f 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -873,14 +873,12 @@ const pickUserVal = (val:any) => {
 }
 
 
-<<<<<<< HEAD
 function asfValueChanged(val:any){
 	//console.log("asfValueChanged",val)
 	emits("asfValueChanged",val)
 }
 
-=======
->>>>>>> qin_v4
+
 </script>
 <template>
 	<BaiduMap v-if="judgeIsShow(data.name) &&data.type === 'baidumap' && type != 4" :data="data" />