Merge branch '0510ShopMusic' into test

src/views/businessManager/shopManager/shopList.vue

@@ -149,7 +149,7 @@
         </el-form-item>
          <el-select
             v-model="searchForm.courseViewType"
-            placeholder="请选择乐团收费模式"
+            placeholder="乐团收费模式"
             clearable
             :disabled="addDisabled"
           >