From b6929a606c64d1b6063521ed8a183da88463a5e1 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 12:11:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/system/user/index.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 86c97b2..83b2fbc 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -87,7 +87,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-            >鍒犻櫎</el-button>
+            >鍋滅敤</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -154,7 +154,7 @@
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-              >鍒犻櫎</el-button>
+              >鍋滅敤</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
                 <el-dropdown-menu slot="dropdown">
@@ -560,6 +560,7 @@
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.userList = response.rows;
+          console.log(this.userList,'userList')
           this.total = response.total;
           this.loading = false;
         }

--
Gitblit v1.9.1