no message

src/views/music/blog/index.vue

@@ -12,11 +12,7 @@
         <el-input v-model="form.podcasterName" placeholder="请输入主播名称" clearable />
       </el-form-item>
       <el-form-item label="播客分类：">
-<<<<<<< HEAD
-        <el-select v-model="form.categoryId" filterable placeholder="请选择内容分类" clearable>
-=======
         <el-select v-model="form.categoryId" filterable placeholder="请选择播客分类" clearable>
->>>>>>> develop/3.1.4
           <el-option v-for="item in blogClassOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>

src/views/music/radio/detail.vue

@@ -17,11 +17,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="广播分类：" prop="contentClassifyId">
-<<<<<<< HEAD
-        <el-select v-model="form.contentClassifyId" placeholder="请选择内容分类">
-=======
         <el-select v-model="form.contentClassifyId" placeholder="请选择广播分类">
->>>>>>> develop/3.1.4
           <el-option v-for="item in contentOptions" :key="item.value" :value="item.value.toString()"
             :label="item.label" />
         </el-select>

src/views/music/radio/index.vue

@@ -16,11 +16,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="广播分类：">
-<<<<<<< HEAD
-        <el-select v-model="form.contentClassifyId" placeholder="请选择内容分类" clearable>
-=======
         <el-select v-model="form.contentClassifyId" placeholder="请选择广播分类" clearable>
->>>>>>> develop/3.1.4
           <el-option v-for="item in contentOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>