fix: 清理菜单管理页残留冲突标记

cfc-web/src/views/admin/MenuManage.vue

@@ -272,7 +272,6 @@ export default {
       const kw = this.searchKeyword.toLowerCase()
       return this.filterTree(this.menuTree, kw)
     },
-<<<<<<< HEAD
     flatMenuOptions() {
       const options = []
       const flatten = (nodes) => {
@@ -368,7 +367,6 @@ export default {
         this.$message.error('加载菜单树失败')
       }
     },
-<<<<<<< HEAD
     // 递归添加 displayName
     addDisplayName(nodes) {
       return (nodes || []).map(n => {