Merge branch 'lihongxiao' into dev

src/views/PeopleManage/Partner.vue

@@ -173,9 +173,9 @@
                   >
                     <el-option
                       v-for="val in managerOptions"
-                      :label="val.userName"
-                      :value="val.userId"
-                      :key="val.userId"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
                     ></el-option>
                   </el-select>
                 </el-form-item>