Merge remote-tracking branch 'origin/develop' into develop

src/pages/config/pages/mechanismManage/pages/committee.vue

@@ -65,7 +65,7 @@
             align="center"
           />
           <el-table-column
-            prop="committeeDeputy"
+            prop="committeeDeputyName"
             label="副主任"
             align="center"
           />
@@ -111,15 +111,22 @@
                 @click.native="choiceZRR('committeeDirector', '选择主任', addForm.committeeDirector)"
               />
             </el-form-item>
+            <el-form-item label="副主任" prop="committeeDeputy" label-width="100px" class="add-form-item">
+              <el-input
+                v-model="addForm.committeeDeputy"
+                placeholder="请选择副主任"
+                @click.native="choiceZRR('committeeDeputy', '选择副主任', addForm.committeeDeputy)"
+              />
+            </el-form-item>
             <el-form-item label="秘书长" prop="committeeSecretary" label-width="100px" class="add-form-item">
               <el-input v-model="addForm.committeeSecretaryName"
                         placeholder="请选择秘书长"
                         @click.native="choiceZRR('committeeSecretary', '选择秘书长', addForm.committeeSecretary)"
                         clearable></el-input>
             </el-form-item>
-            <el-form-item label="委员" prop="committor" label-width="100px" class="add-form-item">
+            <el-form-item label="成员" prop="committor" label-width="100px" class="add-form-item">
               <el-input v-model="addForm.committor"
-                        placeholder="请选择委员"
+                        placeholder="请选择成员"
                         @click.native="choiceZRRS"
                         clearable></el-input>
             </el-form-item>