diff --git a/src/main/java/com/youlai/system/controller/SysUserController.java b/src/main/java/com/youlai/system/controller/SysUserController.java
index 001994b6..1f2c72ef 100644
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -53,10 +53,10 @@ public class SysUserController {
 
     @Operation(summary = "用户分页列表")
     @GetMapping("/page")
-    public PageResult<UserPageVO> getUserPage(
+    public PageResult<UserPageVO> listPagedUsers(
             @ParameterObject UserPageQuery queryParams
     ) {
-        IPage<UserPageVO> result = userService.getUserPage(queryParams);
+        IPage<UserPageVO> result = userService.listPagedUsers(queryParams);
         return PageResult.success(result);
     }
 
diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java
index 8c88d2b3..d94a2074 100644
--- a/src/main/java/com/youlai/system/converter/UserConverter.java
+++ b/src/main/java/com/youlai/system/converter/UserConverter.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.system.model.bo.UserBO;
 import com.youlai.system.model.entity.SysUser;
 import com.youlai.system.model.form.UserForm;
-import com.youlai.system.model.bo.UserFormBO;
 import com.youlai.system.model.vo.UserImportVO;
 import com.youlai.system.model.vo.UserInfoVO;
 import com.youlai.system.model.vo.UserPageVO;
@@ -25,11 +24,9 @@ public interface UserConverter {
     @Mappings({
             @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.system.common.enums.GenderEnum.class))")
     })
-    UserPageVO toPageVo(UserBO bo);
+    UserPageVO bo2PageVo(UserBO bo);
 
-    Page<UserPageVO> toPageVo(Page<UserBO> bo);
-
-    UserForm bo2Form(UserFormBO bo);
+    Page<UserPageVO> bo2PageVo(Page<UserBO> bo);
 
     UserForm entity2Form(SysUser entity);
 
diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java
index 6b7366e9..889c112f 100644
--- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java
+++ b/src/main/java/com/youlai/system/mapper/SysUserMapper.java
@@ -2,11 +2,11 @@ package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.system.model.form.UserForm;
 import com.youlai.system.plugin.mybatis.annotation.DataPermission;
 import com.youlai.system.model.bo.UserBO;
 import com.youlai.system.model.entity.SysUser;
 import com.youlai.system.model.dto.UserAuthInfo;
-import com.youlai.system.model.bo.UserFormBO;
 import com.youlai.system.model.query.UserPageQuery;
 import com.youlai.system.model.vo.UserExportVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -30,7 +30,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     @DataPermission(deptAlias = "u")
-    Page<UserBO> getUserPage(Page<UserBO> page, UserPageQuery queryParams);
+    Page<UserBO> listPagedUsers(Page<UserBO> page, UserPageQuery queryParams);
 
     /**
      * 获取用户表单详情
@@ -38,7 +38,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param userId 用户ID
      * @return
      */
-    UserFormBO getUserDetail(Long userId);
+    UserForm getUserFormData(Long userId);
 
     /**
      * 根据用户名获取认证信息
diff --git a/src/main/java/com/youlai/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/system/model/query/UserPageQuery.java
index 5bf78a33..17d75cff 100644
--- a/src/main/java/com/youlai/system/model/query/UserPageQuery.java
+++ b/src/main/java/com/youlai/system/model/query/UserPageQuery.java
@@ -5,9 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * 用户分页查询对象
  *
diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/system/service/SysUserService.java
index cbf905bd..18ea5d48 100644
--- a/src/main/java/com/youlai/system/service/SysUserService.java
+++ b/src/main/java/com/youlai/system/service/SysUserService.java
@@ -26,7 +26,7 @@ public interface SysUserService extends IService<SysUser> {
      *
      * @return
      */
-    IPage<UserPageVO> getUserPage(UserPageQuery queryParams);
+    IPage<UserPageVO> listPagedUsers(UserPageQuery queryParams);
 
 
     /**
diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
index 85f5814d..24cc2436 100644
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -15,7 +15,6 @@ import com.youlai.system.security.util.SecurityUtils;
 import com.youlai.system.mapper.SysUserMapper;
 import com.youlai.system.model.dto.UserAuthInfo;
 import com.youlai.system.model.bo.UserBO;
-import com.youlai.system.model.bo.UserFormBO;
 import com.youlai.system.model.entity.SysUser;
 import com.youlai.system.model.form.UserForm;
 import com.youlai.system.model.query.UserPageQuery;
@@ -59,11 +58,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 获取用户分页列表
      *
-     * @param queryParams
-     * @return
+     * @param queryParams 查询参数
+     * @return {@link IPage<UserPageVO>} 用户分页列表
      */
     @Override
-    public IPage<UserPageVO> getUserPage(UserPageQuery queryParams) {
+    public IPage<UserPageVO> listPagedUsers(UserPageQuery queryParams) {
 
         // 参数构建
         int pageNum = queryParams.getPageNum();
@@ -74,24 +73,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         DateUtils.toDatabaseFormat(queryParams, "startTime", "endTime");
 
         // 查询数据
-        Page<UserBO> userPage = this.baseMapper.getUserPage(page, queryParams);
+        Page<UserBO> userPage = this.baseMapper.listPagedUsers(page, queryParams);
 
         // 实体转换
-        return userConverter.toPageVo(userPage);
+        return userConverter.bo2PageVo(userPage);
     }
 
     /**
-     * 获取用户详情
+     * 获取用户表单数据
      *
-     * @param userId
+     * @param userId 用户ID
      * @return
      */
     @Override
     public UserForm getUserFormData(Long userId) {
-        UserFormBO userFormBO = this.baseMapper.getUserDetail(userId);
-        // 实体转换po->form
-        UserForm userForm = userConverter.bo2Form(userFormBO);
-        return userForm;
+        return this.baseMapper.getUserFormData(userId);
     }
 
     /**
@@ -161,7 +157,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 删除用户
      *
      * @param idsStr 用户ID，多个以英文逗号(,)分割
-     * @return
+     * @return true|false
      */
     @Override
     public boolean deleteUsers(String idsStr) {
@@ -216,13 +212,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 获取导出用户列表
      *
-     * @param queryParams
-     * @return
+     * @param queryParams 查询参数
+     * @return {@link List<UserExportVO>} 导出用户列表
      */
     @Override
     public List<UserExportVO> listExportUsers(UserPageQuery queryParams) {
-        List<UserExportVO> list = this.baseMapper.listExportUsers(queryParams);
-        return list;
+        return this.baseMapper.listExportUsers(queryParams);
     }
 
     /**
diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml
index df1b698b..13351d6e 100644
--- a/src/main/resources/mapper/SysUserMapper.xml
+++ b/src/main/resources/mapper/SysUserMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.system.mapper.SysUserMapper">
 
     <!-- 用户分页列表 -->
-    <select id="getUserPage" resultType="com.youlai.system.model.bo.UserBO">
+    <select id="listPagedUsers" resultType="com.youlai.system.model.bo.UserBO">
         SELECT
             u.id,
             u.username,
@@ -49,7 +49,7 @@
     </select>
 
     <!-- 用户表单信息映射 -->
-    <resultMap id="UserFormMap" type="com.youlai.system.model.bo.UserFormBO">
+    <resultMap id="UserFormMap" type="com.youlai.system.model.form.UserForm">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="nickname" column="nickname" jdbcType="VARCHAR"/>
@@ -68,19 +68,21 @@
     </resultMap>
 
     <!-- 根据用户ID获取用户详情 -->
-    <select id="getUserDetail" resultMap="UserFormMap">
-        SELECT id,
-               username,
-               nickname,
-               mobile,
-               gender,
-               avatar,
-               email,
-               STATUS,
-               dept_id
-        FROM sys_user
-        WHERE id = #{userId}
-          AND deleted = 0
+    <select id="getUserFormData" resultMap="UserFormMap">
+        SELECT
+            id,
+            username,
+            nickname,
+            mobile,
+            gender,
+            avatar,
+            email,
+            STATUS,
+            dept_id
+        FROM
+            sys_user
+        WHERE
+            id = #{userId} AND deleted = 0
     </select>
 
     <!-- 用户认证信息映射 -->
diff --git a/src/test/java/com/youlai/system/ConfigLoadOrderTests.java b/src/test/java/com/youlai/system/laboratory/ConfigLoadOrderTests.java
similarity index 94%
rename from src/test/java/com/youlai/system/ConfigLoadOrderTests.java
rename to src/test/java/com/youlai/system/laboratory/ConfigLoadOrderTests.java
index 86e3ea1c..a66da62e 100644
--- a/src/test/java/com/youlai/system/ConfigLoadOrderTests.java
+++ b/src/test/java/com/youlai/system/laboratory/ConfigLoadOrderTests.java
@@ -1,4 +1,4 @@
-package com.youlai.system;
+package com.youlai.system.laboratory;
 
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/youlai/system/RedisTests.java b/src/test/java/com/youlai/system/middleware/RedisTests.java
similarity index 95%
rename from src/test/java/com/youlai/system/RedisTests.java
rename to src/test/java/com/youlai/system/middleware/RedisTests.java
index 45380865..bde8faac 100644
--- a/src/test/java/com/youlai/system/RedisTests.java
+++ b/src/test/java/com/youlai/system/middleware/RedisTests.java
@@ -1,4 +1,4 @@
-package com.youlai.system;
+package com.youlai.system.middleware;
 
 import com.youlai.system.model.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;