From e138c314a86110a88cef64de7aa37c2adf148bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 18 Mar 2026 10:39:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A1=86=E6=9E=B6=E5=86=85=E4=B8=8D=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=8E=E8=A7=84=E8=8C=83=E6=98=AF=E5=92=8C?=
 =?UTF-8?q?=E5=90=A6=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/ossConfig/types.ts          |   4 +-
 src/api/system/user/types.ts               |  12 +-
 src/components/UserSelect/index.vue        | 198 ++++++++++-----------
 src/views/system/dict/index.vue            |   4 +-
 src/views/system/menu/index.vue            |  12 +-
 src/views/system/oss/config.vue            |  66 +++----
 src/views/system/role/authUser.vue         |  28 +--
 src/views/system/role/selectUser.vue       |  18 +-
 src/views/system/user/index.vue            | 106 ++++++-----
 src/views/system/user/profile/index.vue    |   2 +-
 src/views/system/user/profile/userInfo.vue |   8 +-
 11 files changed, 232 insertions(+), 226 deletions(-)

diff --git a/src/api/system/ossConfig/types.ts b/src/api/system/ossConfig/types.ts
index d227bd0..870b2ee 100644
--- a/src/api/system/ossConfig/types.ts
+++ b/src/api/system/ossConfig/types.ts
@@ -6,7 +6,7 @@ export interface OssConfigVO extends BaseEntity {
   bucketName: string;
   prefix: string;
   endpoint: string;
-  domain: string;
+  domainUrl: string;
   isHttps: string;
   region: string;
   status: string;
@@ -29,7 +29,7 @@ export interface OssConfigForm {
   bucketName: string;
   prefix: string;
   endpoint: string;
-  domain: string;
+  domainUrl: string;
   isHttps: string;
   accessPolicy: string;
   region: string;
diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts
index 8b6924e..d38efd7 100644
--- a/src/api/system/user/types.ts
+++ b/src/api/system/user/types.ts
@@ -16,11 +16,11 @@ export interface UserInfo {
 export interface UserQuery extends PageQuery {
   userName?: string;
   nickName?: string;
-  phonenumber?: string;
+  phoneNumber?: string;
   status?: string;
   deptId?: string | number;
   roleId?: string | number;
-  userIds?:  string | number | (string | number)[] | undefined;
+  userIds?: string | number | (string | number)[] | undefined;
 }
 
 /**
@@ -34,8 +34,8 @@ export interface UserVO extends BaseEntity {
   nickName: string;
   userType: string;
   email: string;
-  phonenumber: string;
-  sex: string;
+  phoneNumber: string;
+  gender: string;
   avatar: string;
   status: string;
   delFlag: string;
@@ -60,9 +60,9 @@ export interface UserForm {
   userName: string;
   nickName?: string;
   password: string;
-  phonenumber?: string;
+  phoneNumber?: string;
   email?: string;
-  sex?: string;
+  gender?: string;
   status: string;
   remark?: string;
   postIds: string[];
diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue
index 76fd0e4..b96faa1 100644
--- a/src/components/UserSelect/index.vue
+++ b/src/components/UserSelect/index.vue
@@ -3,106 +3,106 @@
     <el-dialog v-model="userDialog.visible.value" :title="userDialog.title.value" width="80%" append-to-body class="user-select-dialog">
       <div class="page-shell user-select-shell">
         <el-row :gutter="12" class="selector-layout">
-        <!-- 部门树 -->
-        <el-col :lg="5" :xs="24">
-          <el-card shadow="hover" class="side-panel selector-card selector-side-card">
-            <template #header>
-              <div class="table-heading">
-                <h3>部门结构</h3>
-              </div>
-            </template>
-            <el-input v-model="deptName" class="selector-dept-input" placeholder="请输入部门名称" prefix-icon="Search" clearable />
-            <el-tree
-              ref="deptTreeRef"
-              class="selector-tree"
-              node-key="id"
-              :data="deptOptions"
-              :props="{ label: 'label', children: 'children' } as any"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              highlight-current
-              default-expand-all
-              @node-click="handleNodeClick"
-            />
-          </el-card>
-        </el-col>
-        <el-col :lg="19" :xs="24">
-          <div class="page-shell user-select-main">
-          <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-            <div v-show="showSearch">
-              <el-card shadow="hover" class="search-panel selector-card">
-                <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
-                  <el-form-item label="用户名称" prop="userName">
-                    <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
-                  </el-form-item>
-                  <el-form-item label="手机号码" prop="phonenumber">
-                    <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                  </el-form-item>
-                  <el-form-item>
-                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                    <el-button icon="Refresh" @click="() => resetQuery()">重置</el-button>
-                  </el-form-item>
-                </el-form>
+          <!-- 部门树 -->
+          <el-col :lg="5" :xs="24">
+            <el-card shadow="hover" class="side-panel selector-card selector-side-card">
+              <template #header>
+                <div class="table-heading">
+                  <h3>部门结构</h3>
+                </div>
+              </template>
+              <el-input v-model="deptName" class="selector-dept-input" placeholder="请输入部门名称" prefix-icon="Search" clearable />
+              <el-tree
+                ref="deptTreeRef"
+                class="selector-tree"
+                node-key="id"
+                :data="deptOptions"
+                :props="{ label: 'label', children: 'children' } as any"
+                :expand-on-click-node="false"
+                :filter-node-method="filterNode"
+                highlight-current
+                default-expand-all
+                @node-click="handleNodeClick"
+              />
+            </el-card>
+          </el-col>
+          <el-col :lg="19" :xs="24">
+            <div class="page-shell user-select-main">
+              <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+                <div v-show="showSearch">
+                  <el-card shadow="hover" class="search-panel selector-card">
+                    <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
+                      <el-form-item label="用户名称" prop="userName">
+                        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
+                      </el-form-item>
+                      <el-form-item label="手机号码" prop="phoneNumber">
+                        <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                        <el-button icon="Refresh" @click="() => resetQuery()">重置</el-button>
+                      </el-form-item>
+                    </el-form>
+                  </el-card>
+                </div>
+              </transition>
+
+              <el-card shadow="hover" class="table-panel selector-card">
+                <template #header>
+                  <div class="toolbar-shell selector-header">
+                    <div class="table-heading">
+                      <h3>用户列表</h3>
+                    </div>
+                    <div v-if="prop.multiple && selectUserList.length" class="selector-tags">
+                      <el-tag v-for="user in selectUserList" :key="user.userId" closable @close="handleCloseTag(user)">
+                        {{ user.nickName }}
+                      </el-tag>
+                    </div>
+                  </div>
+                </template>
+
+                <vxe-table
+                  ref="tableRef"
+                  class="selector-table"
+                  height="400px"
+                  border
+                  show-overflow
+                  :data="userList"
+                  :loading="loading"
+                  :row-config="{ keyField: 'userId', isHover: true }"
+                  :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
+                  @checkbox-all="handleCheckboxAll"
+                  @checkbox-change="handleCheckboxChange"
+                >
+                  <vxe-column type="checkbox" width="50" align="center" />
+                  <vxe-column key="userId" title="用户编号" align="center" field="userId" />
+                  <vxe-column key="userName" title="用户名称" align="center" field="userName" />
+                  <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" />
+                  <vxe-column key="deptName" title="部门" align="center" field="deptName" />
+                  <vxe-column key="phoneNumber" title="手机号码" align="center" field="phoneNumber" width="120" />
+                  <vxe-column key="status" title="状态" align="center">
+                    <template #default="scope">
+                      <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
+                    </template>
+                  </vxe-column>
+
+                  <vxe-column title="创建时间" align="center" width="160">
+                    <template #default="scope">
+                      <span>{{ scope.row.createTime }}</span>
+                    </template>
+                  </vxe-column>
+                </vxe-table>
+
+                <pagination
+                  v-show="total > 0"
+                  v-model:page="queryParams.pageNum"
+                  v-model:limit="queryParams.pageSize"
+                  :total="total"
+                  @pagination="pageList"
+                />
               </el-card>
             </div>
-          </transition>
-
-          <el-card shadow="hover" class="table-panel selector-card">
-            <template #header>
-              <div class="toolbar-shell selector-header">
-                <div class="table-heading">
-                  <h3>用户列表</h3>
-                </div>
-                <div v-if="prop.multiple && selectUserList.length" class="selector-tags">
-                  <el-tag v-for="user in selectUserList" :key="user.userId" closable @close="handleCloseTag(user)">
-                    {{ user.nickName }}
-                  </el-tag>
-                </div>
-              </div>
-            </template>
-
-            <vxe-table
-              ref="tableRef"
-              class="selector-table"
-              height="400px"
-              border
-              show-overflow
-              :data="userList"
-              :loading="loading"
-              :row-config="{ keyField: 'userId', isHover: true }"
-              :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }"
-              @checkbox-all="handleCheckboxAll"
-              @checkbox-change="handleCheckboxChange"
-            >
-              <vxe-column type="checkbox" width="50" align="center" />
-              <vxe-column key="userId" title="用户编号" align="center" field="userId" />
-              <vxe-column key="userName" title="用户名称" align="center" field="userName" />
-              <vxe-column key="nickName" title="用户昵称" align="center" field="nickName" />
-              <vxe-column key="deptName" title="部门" align="center" field="deptName" />
-              <vxe-column key="phonenumber" title="手机号码" align="center" field="phonenumber" width="120" />
-              <vxe-column key="status" title="状态" align="center">
-                <template #default="scope">
-                  <dict-tag :options="sys_normal_disable" :value="scope.row.status"></dict-tag>
-                </template>
-              </vxe-column>
-
-              <vxe-column title="创建时间" align="center" width="160">
-                <template #default="scope">
-                  <span>{{ scope.row.createTime }}</span>
-                </template>
-              </vxe-column>
-            </vxe-table>
-
-            <pagination
-              v-show="total > 0"
-              v-model:page="queryParams.pageNum"
-              v-model:limit="queryParams.pageSize"
-              :total="total"
-              @pagination="pageList"
-            />
-          </el-card>
-          </div>
-        </el-col>
+          </el-col>
         </el-row>
       </div>
 
@@ -159,7 +159,7 @@ const queryParams = ref<UserQuery>({
   pageNum: 1,
   pageSize: 10,
   userName: '',
-  phonenumber: '',
+  phoneNumber: '',
   status: '',
   deptId: '',
   roleId: '',
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index b72dabb..a21281c 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -65,7 +65,7 @@
                   <span class="link-type" @click.stop="handleTypeRowClick(scope.row)">{{ scope.row.dictType }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="备注" align="center" prop="remark" width="160"/>
+              <el-table-column label="备注" align="center" prop="remark" width="160" />
               <el-table-column label="创建时间" align="center" prop="createTime" width="180">
                 <template #default="scope">
                   <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
@@ -219,7 +219,7 @@
         <el-form-item prop="dictType">
           <template #label>
             <span>
-              <el-tooltip content="数据存储中的Key值，如：sys_user_sex" placement="top">
+              <el-tooltip content="数据存储中的Key值，如：sys_user_gender" placement="top">
                 <i class="el-icon-question"></i>
               </el-tooltip>
               字典类型
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3a47169..075ad75 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -143,8 +143,8 @@
                 </span>
               </template>
               <el-radio-group v-model="form.isFrame">
-                <el-radio value="0">是</el-radio>
-                <el-radio value="1">否</el-radio>
+                <el-radio value="Y">是</el-radio>
+                <el-radio value="N">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -221,8 +221,8 @@
                 </span>
               </template>
               <el-radio-group v-model="form.isCache">
-                <el-radio value="0">缓存</el-radio>
-                <el-radio value="1">不缓存</el-radio>
+                <el-radio value="Y">缓存</el-radio>
+                <el-radio value="N">不缓存</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -345,8 +345,8 @@ const initFormData = {
   icon: '',
   menuType: MenuTypeEnum.M,
   orderNum: 1,
-  isFrame: '1',
-  isCache: '0',
+  isFrame: 'N',
+  isCache: 'Y',
   visible: '0',
   status: '0'
 };
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index a30717b..58740ec 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -1,35 +1,35 @@
 <template>
   <div class="p-2 page-shell system-oss-config-page">
     <div class="search-wrap">
-        <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
-          <template #header>
-            <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
-              <div>
-                <span class="panel-kicker">Search Filters</span>
-                <h3>筛选条件</h3>
-              </div>
+      <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
+        <template #header>
+          <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
+            <div>
+              <span class="panel-kicker">Search Filters</span>
+              <h3>筛选条件</h3>
             </div>
-          </template>
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
-            <el-form-item label="配置key" prop="configKey">
-              <el-input v-model="queryParams.configKey" placeholder="配置key" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="桶名称" prop="bucketName">
-              <el-input v-model="queryParams.bucketName" placeholder="请输入桶名称" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="是否默认" prop="status">
-              <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                <el-option key="0" label="是" value="0" />
-                <el-option key="1" label="否" value="1" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
+          </div>
+        </template>
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
+          <el-form-item label="配置key" prop="configKey">
+            <el-input v-model="queryParams.configKey" placeholder="配置key" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="桶名称" prop="bucketName">
+            <el-input v-model="queryParams.bucketName" placeholder="请输入桶名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="是否默认" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+              <el-option key="Y" label="是" value="Y" />
+              <el-option key="N" label="否" value="N" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+    </div>
 
     <el-card shadow="hover" class="table-panel">
       <template #header>
@@ -57,7 +57,7 @@
         <el-table-column v-if="columns[0].visible" label="主建" align="center" prop="ossConfigId" />
         <el-table-column v-if="columns[1].visible" label="配置key" align="center" prop="configKey" />
         <el-table-column v-if="columns[2].visible" label="访问站点" align="center" prop="endpoint" width="200" />
-        <el-table-column v-if="columns[3].visible" label="自定义域名" align="center" prop="domain" width="200" />
+        <el-table-column v-if="columns[3].visible" label="自定义域名" align="center" prop="domainUrl" width="200" />
         <el-table-column v-if="columns[4].visible" label="桶名称" align="center" prop="bucketName" />
         <el-table-column v-if="columns[5].visible" label="前缀" align="center" prop="prefix" />
         <el-table-column v-if="columns[6].visible" label="域" align="center" prop="region" />
@@ -100,8 +100,8 @@
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item label="自定义域名" prop="domain">
-          <el-input v-model="form.domain" placeholder="请输入自定义域名">
+        <el-form-item label="自定义域名" prop="domainUrl">
+          <el-input v-model="form.domainUrl" placeholder="请输入自定义域名">
             <template #prefix>
               <span style="color: #999">{{ protocol }}</span>
             </template>
@@ -193,11 +193,11 @@ const initFormData: OssConfigForm = {
   bucketName: '',
   prefix: '',
   endpoint: '',
-  domain: '',
+  domainUrl: '',
   isHttps: 'N',
   accessPolicy: '1',
   region: '',
-  status: '1',
+  status: 'N',
   remark: ''
 };
 const data = reactive<PageData<OssConfigForm, OssConfigQuery>>({
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 9ded35d..91900a3 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="p-2 page-shell role-auth-user-page">
     <div class="search-wrap">
-        <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
-          <template #header>
-            <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
-              <div><h3>筛选条件</h3></div>
-            </div>
-          </template>
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
+      <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
+        <template #header>
+          <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
+            <div><h3>筛选条件</h3></div>
+          </div>
+        </template>
+        <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
           <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+          <el-form-item label="手机号码" prop="phoneNumber">
+            <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
-          </el-form>
-        </el-card>
-      </div>
+        </el-form>
+      </el-card>
+    </div>
     <el-card shadow="hover" class="table-panel">
       <template #header>
         <div class="toolbar-shell">
@@ -42,7 +42,7 @@
         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phoneNumber" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -94,7 +94,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: route.params.roleId as string,
   userName: undefined,
-  phonenumber: undefined
+  phoneNumber: undefined
 });
 
 /** 查询授权用户列表 */
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 5d266d1..f3a7aab 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -7,8 +7,8 @@
             <el-form-item label="用户名称" prop="userName">
               <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="手机号码" prop="phoneNumber">
+              <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -18,12 +18,20 @@
         </el-card>
 
         <el-card shadow="hover" class="table-panel select-user-card">
-          <el-table ref="tableRef" border class="data-table" :data="userList" height="260px" @row-click="clickRow" @selection-change="handleSelectionChange">
+          <el-table
+            ref="tableRef"
+            border
+            class="data-table"
+            :data="userList"
+            height="260px"
+            @row-click="clickRow"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
             <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-            <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+            <el-table-column label="手机" prop="phoneNumber" :show-overflow-tooltip="true" />
             <el-table-column label="状态" align="center" prop="status">
               <template #default="scope">
                 <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -73,7 +81,7 @@ const queryParams = reactive<UserQuery>({
   pageSize: 10,
   roleId: undefined,
   userName: undefined,
-  phonenumber: undefined
+  phoneNumber: undefined
 });
 
 const tableRef = ref<ElTableInstance>();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4d96086..04dd0aa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -29,49 +29,49 @@
       </el-col>
       <el-col :lg="19" :xs="24" class="content-main">
         <div class="search-wrap">
-            <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
-              <template #header>
-                <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
-                  <div>
-                    <span class="panel-kicker">Search Filters</span>
-                    <h3>筛选条件</h3>
-                  </div>
+          <el-card shadow="hover" class="search-panel" :class="{ 'is-collapsed': !showSearch }">
+            <template #header>
+              <div class="panel-heading search-panel-toggle" @click.stop="showSearch = !showSearch">
+                <div>
+                  <span class="panel-kicker">Search Filters</span>
+                  <h3>筛选条件</h3>
                 </div>
-              </template>
-              <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
-                <el-form-item label="用户名称" prop="userName">
-                  <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="用户昵称" prop="nickName">
-                  <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="phonenumber">
-                  <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-                </el-form-item>
+              </div>
+            </template>
+            <el-form ref="queryFormRef" :model="queryParams" :inline="true" class="query-form">
+              <el-form-item label="用户名称" prop="userName">
+                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="用户昵称" prop="nickName">
+                <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
+              </el-form-item>
+              <el-form-item label="手机号码" prop="phoneNumber">
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+              </el-form-item>
 
-                <el-form-item label="状态" prop="status">
-                  <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
-                    <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="创建时间" style="width: 308px">
-                  <el-date-picker
-                    v-model="dateRange"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-                </el-form-item>
-              </el-form>
-            </el-card>
-          </div>
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="用户状态" clearable>
+                  <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="创建时间" style="width: 308px">
+                <el-date-picker
+                  v-model="dateRange"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </div>
 
         <el-card shadow="hover" class="table-panel">
           <template #header>
@@ -114,7 +114,7 @@
             <el-table-column v-if="columns[1].visible" key="userName" label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[2].visible" key="nickName" label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
             <el-table-column v-if="columns[3].visible" key="deptName" label="部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
-            <el-table-column v-if="columns[4].visible" key="phonenumber" label="手机号码" align="center" prop="phonenumber" width="120" />
+            <el-table-column v-if="columns[4].visible" key="phoneNumber" label="手机号码" align="center" prop="phoneNumber" width="120" />
             <el-table-column v-if="columns[5].visible" key="status" label="状态" align="center">
               <template #default="scope">
                 <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -183,8 +183,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            <el-form-item label="手机号码" prop="phoneNumber">
+              <el-input v-model="form.phoneNumber" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -208,8 +208,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+              <el-select v-model="form.gender" placeholder="请选择">
+                <el-option v-for="dict in sys_user_gender" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -315,7 +315,7 @@ import { useUserStore } from '@/store/modules/user';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { sys_normal_disable, sys_user_sex } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_sex'));
+const { sys_normal_disable, sys_user_gender } = toRefs<any>(proxy?.useDict('sys_normal_disable', 'sys_user_gender'));
 const userList = ref<UserVO[]>();
 const loading = ref(true);
 const showSearch = ref(true);
@@ -373,9 +373,9 @@ const initFormData: UserForm = {
   userName: '',
   nickName: undefined,
   password: '',
-  phonenumber: undefined,
+  phoneNumber: undefined,
   email: undefined,
-  sex: undefined,
+  gender: undefined,
   status: '0',
   remark: '',
   postIds: [],
@@ -388,7 +388,7 @@ const initData: PageData<UserForm, UserQuery> = {
     pageNum: 1,
     pageSize: 10,
     userName: '',
-    phonenumber: '',
+    phoneNumber: '',
     status: '',
     deptId: '',
     roleId: ''
@@ -421,7 +421,7 @@ const initData: PageData<UserForm, UserQuery> = {
         trigger: ['blur', 'change']
       }
     ],
-    phonenumber: [
+    phoneNumber: [
       {
         pattern: /^1[3456789][0-9]\d{8}$/,
         message: '请输入正确的手机号码',
@@ -628,9 +628,7 @@ const handleUpdate = async (row?: UserForm) => {
   dialog.title = '修改用户';
   Object.assign(form.value, data.user);
   postOptions.value = data.posts;
-  roleOptions.value = Array.from(
-    new Map([...data.roles, ...data.user.roles].map(role => [role.roleId, role])).values()
-  );
+  roleOptions.value = Array.from(new Map([...data.roles, ...data.user.roles].map((role) => [role.roleId, role])).values());
   form.value.postIds = data.postIds;
   form.value.roleIds = data.roleIds;
   form.value.password = '';
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index f1c45f4..010a5c6 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -25,7 +25,7 @@
                   <svg-icon icon-class="phone" />
                   <span>手机号码</span>
                 </div>
-                <span class="profile-item-value">{{ state.user.phonenumber || '-' }}</span>
+                <span class="profile-item-value">{{ state.user.phoneNumber || '-' }}</span>
               </li>
               <li class="list-group-item">
                 <div class="profile-item-label">
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index a791c06..a3be4c3 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -3,14 +3,14 @@
     <el-form-item label="用户昵称" prop="nickName">
       <el-input v-model="userForm.nickName" maxlength="30" />
     </el-form-item>
-    <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="userForm.phonenumber" maxlength="11" />
+    <el-form-item label="手机号码" prop="phoneNumber">
+      <el-input v-model="userForm.phoneNumber" maxlength="11" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="userForm.email" maxlength="50" />
     </el-form-item>
     <el-form-item label="性别">
-      <el-radio-group v-model="userForm.sex">
+      <el-radio-group v-model="userForm.gender">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
       </el-radio-group>
@@ -42,7 +42,7 @@ const rule: ElFormRules = {
       trigger: ['blur', 'change']
     }
   ],
-  phonenumber: [
+  phoneNumber: [
     {
       required: true,
       message: '手机号码不能为空',