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