From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/meeting/userStatistics.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/admin/src/views/meeting/userStatistics.vue b/admin/src/views/meeting/userStatistics.vue
index 9d9e37f..35b50f0 100644
--- a/admin/src/views/meeting/userStatistics.vue
+++ b/admin/src/views/meeting/userStatistics.vue
@@ -45,6 +45,7 @@
         <li><el-button :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button></li>
       </ul>
       <el-table
+          :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
         stripe
@@ -166,7 +167,7 @@
     userList({
       page: 1,
       capacity: 9999,
-      model: { realname: this.filterText },
+      model: { realname: this.filterText, companyType: 1 },
     })
       .then(res => {
         console.log('userList', res);

--
Gitblit v1.9.3