合并冲突掉的代码

spring

5 天以前 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b

 src/components/HeaderSearch/index.vue

@@ -15,6 +15,7 @@
        @input="querySearch"

        prefix-icon="Search"

        placeholder="菜单搜索，支持标题、URL模糊查询"

        clearable

      >

      </el-input>