From 9fb47c9db32db45d3c2ced80567f51c91d624f1e Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Tue, 2 Sep 2025 10:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/system/user/components/role-select.vue | 2 +-
 admin/src/views/system/user/components/user-edit.vue   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/src/views/system/user/components/role-select.vue b/admin/src/views/system/user/components/role-select.vue
index 868d3ba..83f7008 100644
--- a/admin/src/views/system/user/components/role-select.vue
+++ b/admin/src/views/system/user/components/role-select.vue
@@ -39,7 +39,7 @@
       /* 获取角色数据 */
       listRoles()
         .then((list) => {
-          this.data = list;
+          this.data = list.list;
         })
         .catch((e) => {
           this.$message.error(e.message);
diff --git a/admin/src/views/system/user/components/user-edit.vue b/admin/src/views/system/user/components/user-edit.vue
index bc51f0f..50e90c2 100644
--- a/admin/src/views/system/user/components/user-edit.vue
+++ b/admin/src/views/system/user/components/user-edit.vue
@@ -12,21 +12,21 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
       <el-row :gutter="15">
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
-          <el-form-item label="用户姓名:" prop="username">
+          <el-form-item label="用户名:" prop="username">
             <el-input
               clearable
               :maxlength="20"
               :disabled="isUpdate"
               v-model="form.username"
-              placeholder="请输入用户姓名"
+              placeholder="请输入用户名"
             />
           </el-form-item>
-          <el-form-item label="用户姓名:" prop="nickname">
+          <el-form-item label="姓名:" prop="nickname">
             <el-input
               clearable
               :maxlength="20"
               v-model="form.nickname"
-              placeholder="请输入用户名"
+              placeholder="请输入姓名"
             />
           </el-form-item>
           <el-form-item label="性别:" prop="sex">