Merge remote-tracking branch 'origin/master'

src/views/qw/friendWelcome/indexNew.vue

@@ -15,9 +15,9 @@
         <el-select v-model="queryParams.qwUserIds" filterable  clearable placeholder="公司员工"   size="small">
           <el-option
              v-for="dict in companyUserList"
-             :key="dict.qwUserId"
-             :label="dict.nickName"
-             :value="dict.qwUserId">
+             :key="dict.id"
+             :label="dict.qwUserName"
+             :value="dict.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -1220,6 +1220,7 @@ export default {
           }
 
         }
+        this.loading = false;
       });
     },