From 95c040fdaa5a410d1b084dacb8a4a6c35cc014bc Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Thu, 12 Sep 2024 16:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/formItem.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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" />