Merge branch 'develop/3.1.4' into test

# Conflicts:
#	src/views/music/blog/index.vue
#	src/views/music/choiceness/detail.vue
#	src/views/music/radio/detail.vue
#	src/views/music/radio/index.vue

src/views/music/blog/index.vue

@@ -12,7 +12,11 @@
         <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/choiceness/detail.vue

@@ -67,7 +67,11 @@
           </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" />
           </el-select>
         </el-form-item>

src/views/music/radio/detail.vue

@@ -17,7 +17,11 @@
         </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>
@@ -63,7 +67,7 @@ export default {
           required: true, message: '请选择地域分类', trigger: 'change'
         }],
         contentClassifyId: [{
-          required: true, message: '请选择内容分类', trigger: 'change'
+          required: true, message: '请选择广播分类', trigger: 'change'
         }],
         description: [{
           required: true, message: '请输入电台简介', trigger: 'blur'

src/views/music/radio/index.vue

@@ -16,7 +16,11 @@
         </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>
@@ -91,7 +95,7 @@ export default {
       total: 0,
       // 列表
       tableData: [],
-      // 内容分类
+      // 广播分类
       contentOptions: [],
       // 地域分类
       addressOptions: [],

src/views/operation/agreement/index.vue

@@ -67,6 +67,9 @@ export default {
       },{
         value: 8,
         label: '已收集个人信息清单'
+      }, {
+        value: 9,
+        label: '连接设备提示'
       }]
     }
   },