diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 1aeecd3..1e3c807 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -588,11 +588,8 @@ const changeActiveTabs = (val: number,val2: number) => {
   form.value.activeTabs = val;
   form.value.activeChildTabs= val2;
   tableHeaderInit(val)
-<<<<<<< HEAD
-  //console.log(form,val,666)
-=======
   console.log(form,val,val2,666)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
 };
 
 //根据当前功能，初始化表头下拉框中的默认值和禁用值
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 23dbef9..6097cef 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -133,12 +133,9 @@ const handleChange = (val: string[]) => {
 const handleTabsChange = (val) => {
   form.value.activeTabs = 0;
   form.value.activeTabs = 3;
-<<<<<<< HEAD
- // console.log(val)
-=======
   form.value.activeChildTabs = Number(val);
   console.log(val)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
 }
 localStorage.setItem("color", "red");
 //功能选择数据
diff --git a/frontend/src/views/system/dictionary/dictTree/index.vue b/frontend/src/views/system/dictionary/dictTree/index.vue
index aa2964b..350b29b 100644
--- a/frontend/src/views/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -80,11 +80,8 @@
       prop: 'operation',
       label: '操作',
       fixed: 'right',
-<<<<<<< HEAD
       width:250,
-=======
-      width: 250,
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
     },
   ])
 
@@ -96,10 +93,6 @@
   
   // 删除字典类型
   const handleDelete = async (params: Dict.ResDictTree) => {
-<<<<<<< HEAD
-=======
-    console.log(params)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
     await useHandleData(deleteDictTree, params, `删除【${params.name}】树形字典类型`)
     proTable.value?.getTableList()
   }