diff --git a/src/views/knowledge/knowledge/components/KnowledgeContent.vue b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
index 7761c0353..e7cbd4398 100644
--- a/src/views/knowledge/knowledge/components/KnowledgeContent.vue
+++ b/src/views/knowledge/knowledge/components/KnowledgeContent.vue
@@ -54,13 +54,10 @@ watch(() => props.isShow, () => {
 
 <template>
     <el-dialog v-model="boxShow" class="dialogStyle" :show-close="true">
-<<<<<<< HEAD
-        <template #header="{ close, titleId, titleClass }">
-            <div class="my-header" @dblclick="close">
-=======
+
         <template #header="{  titleId, titleClass }">
             <div class="my-header">
->>>>>>> v3
+
                 <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gTitle }}</h4>
                 <!-- <h4 :id="titleId" :class="titleClass" style="margin-top: 5px;">{{ props.contentSource?.gContent }}</h4> -->
             </div>
diff --git a/src/views/redismanage/datamigration/index.vue b/src/views/redismanage/datamigration/index.vue
index eac84dc36..8e0fd2002 100644
--- a/src/views/redismanage/datamigration/index.vue
+++ b/src/views/redismanage/datamigration/index.vue
@@ -162,7 +162,7 @@ const migrateRedisInfo = () =>{
 		dblist:originCheckList.value	//选择库
 	}
 	moveOldRedisToNewRedis(sendInfo)
-		.then((data)=>{
+		.then((data:any)=>{
 			console.log("进行源Redis连接测试",data)
 			logList.value = data.data
 		})