2022-11-15 9:00

src/components/normal-basic-layout/index.vue

@@ -29,10 +29,7 @@
           </el-radio-group> -->
           <slot name="custom"></slot>
           <div>
-<<<<<<< HEAD
-=======
             <!-- <label for="">搜索:&nbsp;</label> -->
->>>>>>> xiaoqin
             <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" style="width:200px" size="small" class="input-with-select inline-16" clearable>
             </el-input>
           </div>