Merge remote-tracking branch 'origin/master'

src/views/contentManagement/activity/info/index.vue

@@ -237,7 +237,7 @@
                 <el-input
                   v-model.trim="form.femaleCount"
                   :disabled="secondFromDisabled"
-                  placeholder="请女生数量"
+                  placeholder="请输入女生数量"
                   size="small"
                   class="normalInput"
                   :maxlength="100"

src/views/contentManagement/banner/index.vue

@@ -14,7 +14,7 @@
             />
           </el-form-item>
           <el-form-item label="分类:" prop="type">
-            <el-select v-model.trim="queryParams.isTop" show-word-limit placeholder="请输入类型" style="width: 100%">
+            <el-select v-model.trim="queryParams.type" show-word-limit placeholder="请输入类型" style="width: 100%">
               <el-option
                 v-for="item in typeField"
                 :key="item.value"