diff --git a/.claude/agents/backend-crud.md b/.claude/agents/backend-crud.md
index 0dc8b334c..26d732bf8 100644
--- a/.claude/agents/backend-crud.md
+++ b/.claude/agents/backend-crud.md
@@ -18,7 +18,7 @@ description: 标准后端 CRUD 专家。用于当前项目中的新增单表 CRU
 - mapper 默认继承 `BaseMapperPlus<Entity, Vo>`
 - BO 使用 `@AutoMapper(target = Entity.class, reverseConvertGenerate = false)`
 - VO 使用 `@AutoMapper(target = Entity.class)`
-- service 使用 `baseMapper`
+- 代码生成器模板按类名首字母小写命名 Mapper 字段，例如 `SysRoleMapper` -> `sysRoleMapper`；手写业务代码可使用具体业务短名
 
 ## 默认方法集合
 
diff --git a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md
index cea7f02d7..a71dc8edf 100644
--- a/.codex/skills/ruoyi-plus-ai-coding/SKILL.md
+++ b/.codex/skills/ruoyi-plus-ai-coding/SKILL.md
@@ -129,7 +129,8 @@ Vue 3、TypeScript API 文件、生成式列表页、表单状态、字典和日
 - 包路径和 `@RequestMapping` 与模块保持一致。
 - 权限标识遵循 `${module}:${business}:${action}`。
 - Mapper 继承 `BaseMapperPlus<Entity, Vo>`。
-- Service 使用 `baseMapper`，并按场景返回 `PageResult` 或 `List<Vo>`。
+- 手写 Service 注入 Mapper 时使用具体业务短名；代码生成器模板按类名首字母小写命名，例如 `SysRoleMapper` 生成 `sysRoleMapper`。
+- Service 按场景返回 `PageResult` 或 `List<Vo>`。
 - 查询代码优先使用 `LambdaQueryWrapper`，复杂模块沿用既有 MPJ 联表风格。
 - BO 使用 `@AutoMapper(target = Entity.class, reverseConvertGenerate = false)`。
 - VO 使用 `@AutoMapper(target = Entity.class)`。
diff --git a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md
index 061361d4f..999284194 100644
--- a/.codex/skills/ruoyi-plus-ai-coding/references/backend.md
+++ b/.codex/skills/ruoyi-plus-ai-coding/references/backend.md
@@ -86,13 +86,15 @@
 ## Service 规则
 
 - 类声明通常是 `@RequiredArgsConstructor`、`@Service`，按需补 `@Slf4j`。
-- mapper 注入字段命名为 `private final XxxMapper baseMapper;`。
+- 手写 mapper 注入字段使用具体业务短名；代码生成器模板按类名首字母小写命名。
+- 命名时去掉清晰的模块/系统前缀后使用 lowerCamel + `Mapper`，例如 `SysRoleMapper` -> `roleMapper`、`SysDictDataMapper` -> `dictDataMapper`。
+- 如果去掉前缀会产生歧义或命名冲突，保留必要前缀。
 - 读操作通常返回 `Vo`、`List<Vo>` 或 `PageResult<Vo>`。
 - BO 转实体用 `MapstructUtils.convert(bo, Entity.class)`。
 - 查询条件优先用 `LambdaQueryWrapper` 和 `Wrappers.lambdaQuery()`。
 - 在 wrapper 条件里直接写 `StringUtils.isNotBlank(...)` 和 null 判断。
 - 分页查询优先采用：
-  `Page<Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);`
+  `Page<Vo> result = entityMapper.selectVoPage(pageQuery.build(), lqw);`
   `return PageResult.build(result.getRecords(), result.getTotal());`
 - 生成器风格模块保留 `validEntityBeforeSave(...)` 这种扩展点。
 - 多表写操作使用 `@Transactional(rollbackFor = Exception.class)`。
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java
index 3ca49382a..48d37d5b9 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/LambdaCrudChainWrapper.java
@@ -36,22 +36,22 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
     Update<LambdaCrudChainWrapper<T, V>, SFunction<T, ?>>,
     LambdaQueryCondition<T, LambdaCrudChainWrapper<T, V>> {
 
-    private final BaseMapperPlus<T, V> baseMapper;
+    private final BaseMapperPlus<T, V> crudMapper;
     private final List<String> sqlSet;
     private SharedString sqlSelect = new SharedString();
 
-    public LambdaCrudChainWrapper(BaseMapperPlus<T, V> baseMapper) {
-        this.baseMapper = baseMapper;
-        super.setEntityClass(baseMapper.currentModelClass());
+    public LambdaCrudChainWrapper(BaseMapperPlus<T, V> crudMapper) {
+        this.crudMapper = crudMapper;
+        super.setEntityClass(crudMapper.currentModelClass());
         super.initNeed();
         this.sqlSet = new ArrayList<>();
     }
 
-    LambdaCrudChainWrapper(BaseMapperPlus<T, V> baseMapper, T entity, Class<T> entityClass, SharedString sqlSelect,
+    LambdaCrudChainWrapper(BaseMapperPlus<T, V> crudMapper, T entity, Class<T> entityClass, SharedString sqlSelect,
                            List<String> sqlSet, AtomicInteger paramNameSeq, Map<String, Object> paramNameValuePairs,
                            MergeSegments mergeSegments, SharedString paramAlias, SharedString lastSql,
                            SharedString sqlComment, SharedString sqlFirst) {
-        this.baseMapper = baseMapper;
+        this.crudMapper = crudMapper;
         super.setEntity(entity);
         super.setEntityClass(entityClass);
         this.sqlSelect = sqlSelect == null ? new SharedString() : sqlSelect;
@@ -197,7 +197,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 实体列表
      */
     public List<T> list() {
-        return baseMapper.selectList(typedThis);
+        return crudMapper.selectList(typedThis);
     }
 
     /**
@@ -207,7 +207,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 实体分页记录
      */
     public List<T> list(IPage<T> page) {
-        return baseMapper.selectList(page, typedThis);
+        return crudMapper.selectList(page, typedThis);
     }
 
     /**
@@ -216,7 +216,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return VO 列表
      */
     public List<V> voList() {
-        return baseMapper.selectVoList(typedThis);
+        return crudMapper.selectVoList(typedThis);
     }
 
     /**
@@ -225,7 +225,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 单列对象列表
      */
     public List<Object> objs() {
-        return baseMapper.selectObjs(typedThis);
+        return crudMapper.selectObjs(typedThis);
     }
 
     /**
@@ -236,7 +236,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 单列对象列表
      */
     public <C> List<C> objs(Function<? super Object, C> mapper) {
-        return baseMapper.selectObjs(typedThis, mapper);
+        return crudMapper.selectObjs(typedThis, mapper);
     }
 
     /**
@@ -245,7 +245,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 实体
      */
     public T one() {
-        return baseMapper.selectOne(typedThis);
+        return crudMapper.selectOne(typedThis);
     }
 
     /**
@@ -255,7 +255,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 实体
      */
     public T one(boolean throwEx) {
-        return baseMapper.selectOne(typedThis, throwEx);
+        return crudMapper.selectOne(typedThis, throwEx);
     }
 
     /**
@@ -273,7 +273,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return VO
      */
     public V voOne() {
-        return baseMapper.selectVoOne(typedThis);
+        return crudMapper.selectVoOne(typedThis);
     }
 
     /**
@@ -283,7 +283,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return VO
      */
     public V voOne(boolean throwEx) {
-        return baseMapper.selectVoOne(typedThis, throwEx);
+        return crudMapper.selectVoOne(typedThis, throwEx);
     }
 
     /**
@@ -292,7 +292,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 数量
      */
     public Long count() {
-        return baseMapper.selectCount(typedThis);
+        return crudMapper.selectCount(typedThis);
     }
 
     /**
@@ -301,7 +301,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 是否存在
      */
     public boolean exists() {
-        return baseMapper.exists(typedThis);
+        return crudMapper.exists(typedThis);
     }
 
     /**
@@ -312,7 +312,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 实体分页
      */
     public <P extends IPage<T>> P page(P page) {
-        return baseMapper.selectPage(page, typedThis);
+        return crudMapper.selectPage(page, typedThis);
     }
 
     /**
@@ -323,7 +323,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return VO 分页
      */
     public <P extends IPage<V>> P voPage(IPage<T> page) {
-        return baseMapper.selectVoPage(page, typedThis);
+        return crudMapper.selectVoPage(page, typedThis);
     }
 
     /**
@@ -341,7 +341,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 影响行数
      */
     public int deleteCount() {
-        return baseMapper.delete(typedThis);
+        return crudMapper.delete(typedThis);
     }
 
     /**
@@ -369,7 +369,7 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 影响行数
      */
     public int updateCount() {
-        return baseMapper.update(typedThis);
+        return crudMapper.update(typedThis);
     }
 
     /**
@@ -379,12 +379,12 @@ public class LambdaCrudChainWrapper<T, V> extends AbstractLambdaWrapper<T, Lambd
      * @return 影响行数
      */
     public int updateCount(T entity) {
-        return baseMapper.update(entity, typedThis);
+        return crudMapper.update(entity, typedThis);
     }
 
     @Override
     protected LambdaCrudChainWrapper<T, V> instance() {
-        return new LambdaCrudChainWrapper<>(baseMapper, getEntity(), getEntityClass(), null, null, paramNameSeq,
+        return new LambdaCrudChainWrapper<>(crudMapper, getEntity(), getEntityClass(), null, null, paramNameSeq,
             paramNameValuePairs, new MergeSegments(), paramAlias, SharedString.emptyString(), SharedString.emptyString(),
             SharedString.emptyString());
     }
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java
index 014b7e81d..872246dbf 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java
@@ -29,7 +29,7 @@ import java.util.List;
 @Service
 public class TestDemoServiceImpl implements ITestDemoService {
 
-    private final TestDemoMapper baseMapper;
+    private final TestDemoMapper demoMapper;
 
     /**
      * 根据主键查询测试单表详情。
@@ -39,7 +39,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
      */
     @Override
     public TestDemoVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        return demoMapper.selectVoById(id);
     }
 
     /**
@@ -52,7 +52,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
     @Override
     public PageResult<TestDemoVo> queryPageList(TestDemoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TestDemo> lqw = buildQueryWrapper(bo);
-        Page<TestDemoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<TestDemoVo> result = demoMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 
@@ -66,7 +66,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
     @Override
     public PageResult<TestDemoVo> customPageList(TestDemoBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TestDemo> lqw = buildQueryWrapper(bo);
-        Page<TestDemoVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
+        Page<TestDemoVo> result = demoMapper.customPageList(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 
@@ -78,7 +78,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
      */
     @Override
     public List<TestDemoVo> queryList(TestDemoBo bo) {
-        return baseMapper.selectVoList(buildQueryWrapper(bo));
+        return demoMapper.selectVoList(buildQueryWrapper(bo));
     }
 
     /**
@@ -107,7 +107,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
     public Boolean insertByBo(TestDemoBo bo) {
         TestDemo add = MapstructUtils.convert(bo, TestDemo.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = demoMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -124,7 +124,7 @@ public class TestDemoServiceImpl implements ITestDemoService {
     public Boolean updateByBo(TestDemoBo bo) {
         TestDemo update = MapstructUtils.convert(bo, TestDemo.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return demoMapper.updateById(update) > 0;
     }
 
     /**
@@ -147,12 +147,12 @@ public class TestDemoServiceImpl implements ITestDemoService {
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
-            List<TestDemo> list = baseMapper.selectByIds(ids);
+            List<TestDemo> list = demoMapper.selectByIds(ids);
             if (list.size() != ids.size()) {
                 throw new ServiceException("您没有删除权限!");
             }
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        return demoMapper.deleteByIds(ids) > 0;
     }
 
     /**
@@ -163,6 +163,6 @@ public class TestDemoServiceImpl implements ITestDemoService {
      */
     @Override
     public Boolean saveBatch(List<TestDemo> list) {
-        return baseMapper.insertBatch(list);
+        return demoMapper.insertBatch(list);
     }
 }
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java
index 4671e4876..acf87a699 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java
@@ -26,7 +26,7 @@ import java.util.List;
 @Service
 public class TestTreeServiceImpl implements ITestTreeService {
 
-    private final TestTreeMapper baseMapper;
+    private final TestTreeMapper treeMapper;
 
     /**
      * 根据主键查询测试树表详情。
@@ -36,7 +36,7 @@ public class TestTreeServiceImpl implements ITestTreeService {
      */
     @Override
     public TestTreeVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        return treeMapper.selectVoById(id);
     }
 
     // @DS("slave") // 切换从库查询
@@ -49,7 +49,7 @@ public class TestTreeServiceImpl implements ITestTreeService {
     @Override
     public List<TestTreeVo> queryList(TestTreeBo bo) {
         LambdaQueryWrapper<TestTree> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return treeMapper.selectVoList(lqw);
     }
 
     /**
@@ -77,7 +77,7 @@ public class TestTreeServiceImpl implements ITestTreeService {
     public Boolean insertByBo(TestTreeBo bo) {
         TestTree add = MapstructUtils.convert(bo, TestTree.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = treeMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -94,7 +94,7 @@ public class TestTreeServiceImpl implements ITestTreeService {
     public Boolean updateByBo(TestTreeBo bo) {
         TestTree update = MapstructUtils.convert(bo, TestTree.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return treeMapper.updateById(update) > 0;
     }
 
     /**
@@ -118,6 +118,6 @@ public class TestTreeServiceImpl implements ITestTreeService {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        return treeMapper.deleteByIds(ids) > 0;
     }
 }
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
index ad1c5022c..a06e9459c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
@@ -52,7 +52,7 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class GenTableServiceImpl implements IGenTableService {
 
-    private final GenTableMapper baseMapper;
+    private final GenTableMapper tableMapper;
     private final GenTableColumnMapper genTableColumnMapper;
 
     private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"};
@@ -93,7 +93,7 @@ public class GenTableServiceImpl implements IGenTableService {
      */
     @Override
     public PageResult<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
-        Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
+        Page<GenTable> page = tableMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -134,7 +134,7 @@ public class GenTableServiceImpl implements IGenTableService {
         if (CollUtil.isEmpty(tablesMap)) {
             return PageResult.build();
         }
-        List<String> tableNames = baseMapper.selectTableNameList(genTable.getDataName());
+        List<String> tableNames = tableMapper.selectTableNameList(genTable.getDataName());
         String[] tableArrays;
         if (CollUtil.isNotEmpty(tableNames)) {
             tableArrays = tableNames.toArray(new String[0]);
@@ -230,7 +230,7 @@ public class GenTableServiceImpl implements IGenTableService {
         normalizeColumnOptions(genTable.getColumns());
         String options = JsonUtils.toJsonString(genTable.getParams());
         genTable.setOptions(options);
-        int row = baseMapper.updateById(genTable);
+        int row = tableMapper.updateById(genTable);
         if (row > 0) {
             genTableColumnMapper.updateBatchById(genTable.getColumns());
         }
@@ -245,7 +245,7 @@ public class GenTableServiceImpl implements IGenTableService {
     @Override
     public void deleteGenTableByIds(Long[] tableIds) {
         List<Long> ids = Arrays.asList(tableIds);
-        baseMapper.deleteByIds(ids);
+        tableMapper.deleteByIds(ids);
         genTableColumnMapper.lambda()
             .in(GenTableColumn::getTableId, ids)
             .deleteCount();
@@ -265,7 +265,7 @@ public class GenTableServiceImpl implements IGenTableService {
                 String tableName = table.getTableName();
                 GenUtils.initTable(table);
                 table.setDataName(dataName);
-                int row = baseMapper.insert(table);
+                int row = tableMapper.insert(table);
                 if (row > 0) {
                     // 保存列信息
                     List<GenTableColumn> genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName);
@@ -534,7 +534,7 @@ public class GenTableServiceImpl implements IGenTableService {
      * @return 包含字段集合的业务表实体
      */
     private GenTable getGenTable(Long tableId) {
-        GenTable table = baseMapper.selectById(tableId);
+        GenTable table = tableMapper.selectById(tableId);
         if (ObjectUtil.isNull(table)) {
             throw new ServiceException("业务表不存在");
         }
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
index b7dc57b3d..d6e15e721 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm
@@ -41,7 +41,7 @@ import java.util.Collection;
 @Service
 public class ${ClassName}ServiceImpl implements I${ClassName}Service {
 
-    private final ${ClassName}Mapper baseMapper;
+    private final ${ClassName}Mapper ${className}Mapper;
 
 #set($TreeParentCap = "")
 #if("" != $treeParentCode)
@@ -64,7 +64,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) {
-        return baseMapper.selectVoById(${pkColumn.javaField});
+        return ${className}Mapper.selectVoById(${pkColumn.javaField});
     }
 
 #if($table.crud)
@@ -78,7 +78,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     @Override
     public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<${ClassName}Vo> result = ${className}Mapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 #end
@@ -92,7 +92,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     @Override
     public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
         LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return ${className}Mapper.selectVoList(lqw);
     }
 
 #if($enableUnique)
@@ -120,7 +120,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         lqw.eq(${ClassName}::get${column.capJavaField}, bo.get${column.capJavaField}());
 #end
         lqw.ne(bo.get${pkColumn.capJavaField}() != null, ${ClassName}::get${pkColumn.capJavaField}, bo.get${pkColumn.capJavaField}());
-        return !baseMapper.exists(lqw);
+        return !${className}Mapper.exists(lqw);
     }
 #end
 
@@ -200,7 +200,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         fillTreeMetaBeforeSave(add, false);
 #end
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = ${className}Mapper.insert(add) > 0;
         if (flag) {
             bo.set${pkColumn.capJavaField}(add.get${pkColumn.capJavaField}());
         }
@@ -220,7 +220,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         fillTreeMetaBeforeSave(update, true);
 #end
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return ${className}Mapper.updateById(update) > 0;
     }
 
 #if($enableStatus)
@@ -233,7 +233,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean updateStatus(${pkColumn.javaType} ${pkColumn.javaField}, ${statusColumn.javaType} status) {
-        return baseMapper.lambda()
+        return ${className}Mapper.lambda()
             .set(${ClassName}::get${statusColumn.capJavaField}, status)
             .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField})
             .update();
@@ -250,7 +250,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean updateSort(${pkColumn.javaType} ${pkColumn.javaField}, ${sortColumn.javaType} sortValue) {
-        return baseMapper.lambda()
+        return ${className}Mapper.lambda()
             .set(${ClassName}::get${sortColumn.capJavaField}, sortValue)
             .eq(${ClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField})
             .update();
@@ -276,7 +276,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
 #if("" != $treeAncestorsField)
         ${ClassName} parent = null;
         if (!ObjectUtil.equal(entity.get${TreeParentCap}(), ${treeRootValueJavaLiteral})) {
-            parent = baseMapper.selectById(entity.get${TreeParentCap}());
+            parent = ${className}Mapper.selectById(entity.get${TreeParentCap}());
             if (ObjectUtil.isNull(parent)) {
                 throw new ServiceException("${functionName}父节点不存在");
             }
@@ -287,7 +287,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         }
         String newAncestors = resolveAncestors(entity.get${TreeParentCap}(), parent);
         if (updateMode && entity.get${pkColumn.capJavaField}() != null) {
-            ${ClassName} oldEntity = baseMapper.selectById(entity.get${pkColumn.capJavaField}());
+            ${ClassName} oldEntity = ${className}Mapper.selectById(entity.get${pkColumn.capJavaField}());
             if (ObjectUtil.isNull(oldEntity)) {
                 throw new ServiceException("${functionName}不存在，无法修改");
             }
@@ -316,7 +316,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     }
 
     private void updateChildrenAncestors(${pkColumn.javaType} currentId, String newAncestors, String oldAncestors) {
-        List<${ClassName}> children = baseMapper.lambda()
+        List<${ClassName}> children = ${className}Mapper.lambda()
             .select(${ClassName}::get${pkColumn.capJavaField}, ${ClassName}::get${TreeAncestorsCap})
             .findInSet(currentId, ${ClassName}::get${TreeAncestorsCap})
             .list();
@@ -332,7 +332,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
             updateList.add(update);
         }
         if (!updateList.isEmpty()) {
-            baseMapper.updateBatchById(updateList);
+            ${className}Mapper.updateBatchById(updateList);
         }
     }
 
@@ -359,6 +359,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
         if (isValid) {
             // 可在此扩展删除前业务校验
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        return ${className}Mapper.deleteByIds(ids) > 0;
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
index adbf10ac9..5c94e350d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
@@ -39,7 +39,7 @@ public class SysClientServiceImpl implements ISysClientService {
 
     private static final String CLIENT_RULE_SEPARATOR_REGEX = "[,;\\r\\n]+";
 
-    private final SysClientMapper baseMapper;
+    private final SysClientMapper clientMapper;
 
     /**
      * 查询客户端管理
@@ -49,7 +49,7 @@ public class SysClientServiceImpl implements ISysClientService {
      */
     @Override
     public SysClientVo queryById(Long id) {
-        SysClientVo vo = baseMapper.selectVoById(id);
+        SysClientVo vo = clientMapper.selectVoById(id);
         fillClientRuleFields(vo);
         return vo;
     }
@@ -63,7 +63,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId")
     @Override
     public SysClientVo queryByClientId(String clientId) {
-        SysClientVo vo = baseMapper.lambda().eq(SysClient::getClientId, clientId).voOne();
+        SysClientVo vo = clientMapper.lambda().eq(SysClient::getClientId, clientId).voOne();
         fillClientRuleFields(vo);
         return vo;
     }
@@ -78,7 +78,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @Override
     public PageResult<SysClientVo> queryPageList(SysClientBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
-        Page<SysClientVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysClientVo> result = clientMapper.selectVoPage(pageQuery.build(), lqw);
         result.getRecords().forEach(this::fillClientRuleFields);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
@@ -92,7 +92,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @Override
     public List<SysClientVo> queryList(SysClientBo bo) {
         LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
-        List<SysClientVo> list = baseMapper.selectVoList(lqw);
+        List<SysClientVo> list = clientMapper.selectVoList(lqw);
         list.forEach(this::fillClientRuleFields);
         return list;
     }
@@ -129,7 +129,7 @@ public class SysClientServiceImpl implements ISysClientService {
         String clientKey = bo.getClientKey();
         String clientSecret = bo.getClientSecret();
         add.setClientId(SecureUtil.md5(clientKey + clientSecret));
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = clientMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -149,7 +149,7 @@ public class SysClientServiceImpl implements ISysClientService {
         update.setGrantType(StringUtils.joinComma(bo.getGrantTypeList()));
         update.setAccessPath(resolveRuleValue(bo.getAccessPath(), bo.getAccessPathList(), this::normalizeAccessPath));
         update.setIpWhitelist(resolveRuleValue(bo.getIpWhitelist(), bo.getIpWhitelistList(), UnaryOperator.identity()));
-        return baseMapper.updateById(update) > 0;
+        return clientMapper.updateById(update) > 0;
     }
 
     /**
@@ -162,7 +162,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId")
     @Override
     public int updateClientStatus(String clientId, String status) {
-        return baseMapper.lambda()
+        return clientMapper.lambda()
             .set(SysClient::getStatus, status)
             .eq(SysClient::getClientId, clientId)
             .updateCount();
@@ -178,7 +178,7 @@ public class SysClientServiceImpl implements ISysClientService {
     @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true)
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        return baseMapper.deleteByIds(ids) > 0;
+        return clientMapper.deleteByIds(ids) > 0;
     }
 
     /**
@@ -189,7 +189,7 @@ public class SysClientServiceImpl implements ISysClientService {
      */
     @Override
     public boolean checkClickKeyUnique(SysClientBo client) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = clientMapper.lambda()
             .eq(SysClient::getClientKey, client.getClientKey())
             .neIfPresent(SysClient::getId, client.getId())
             .exists();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
index 049c1d160..56862ff6e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
@@ -41,7 +41,7 @@ import java.util.Map;
 @Service
 public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
 
-    private final SysConfigMapper baseMapper;
+    private final SysConfigMapper configMapper;
 
     /**
      * 分页查询参数配置列表
@@ -53,7 +53,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Override
     public PageResult<SysConfigVo> selectPageConfigList(SysConfigBo config, PageQuery pageQuery) {
         LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
-        Page<SysConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysConfigVo> page = configMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -65,7 +65,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      */
     @Override
     public SysConfigVo selectConfigById(Long configId) {
-        return baseMapper.selectVoById(configId);
+        return configMapper.selectVoById(configId);
     }
 
     /**
@@ -77,7 +77,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
     @Override
     public String selectConfigByKey(String configKey) {
-        SysConfig retConfig = baseMapper.lambda().eq(SysConfig::getConfigKey, configKey).one();
+        SysConfig retConfig = configMapper.lambda().eq(SysConfig::getConfigKey, configKey).one();
         return ObjectUtils.notNullGetter(retConfig, SysConfig::getConfigValue, StringUtils.EMPTY);
     }
 
@@ -100,7 +100,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Override
     public List<SysConfigVo> selectConfigList(SysConfigBo config) {
         LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
-        return baseMapper.selectVoList(lqw);
+        return configMapper.selectVoList(lqw);
     }
 
     /**
@@ -130,7 +130,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     @Override
     public String insertConfig(SysConfigBo bo) {
         SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
-        int row = baseMapper.insert(config);
+        int row = configMapper.insert(config);
         if (row > 0) {
             return config.getConfigValue();
         }
@@ -149,14 +149,14 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
         int row = 0;
         SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
         if (config.getConfigId() != null) {
-            SysConfig temp = baseMapper.selectById(config.getConfigId());
+            SysConfig temp = configMapper.selectById(config.getConfigId());
             if (ObjectUtil.isNotNull(temp) && !StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) {
                 CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey());
             }
-            row = baseMapper.updateById(config);
+            row = configMapper.updateById(config);
         } else {
             CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
-            row = baseMapper.lambda()
+            row = configMapper.lambda()
                 .eq(SysConfig::getConfigKey, config.getConfigKey())
                 .updateCount(config);
         }
@@ -173,14 +173,14 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      */
     @Override
     public void deleteConfigByIds(Collection<Long> configIds) {
-        List<SysConfig> list = baseMapper.selectByIds(configIds);
+        List<SysConfig> list = configMapper.selectByIds(configIds);
         list.forEach(config -> {
             if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) {
                 throw new ServiceException("内置参数【{}】不能删除", config.getConfigKey());
             }
             CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
         });
-        baseMapper.deleteByIds(configIds);
+        configMapper.deleteByIds(configIds);
     }
 
     /**
@@ -199,7 +199,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
      */
     @Override
     public boolean checkConfigKeyUnique(SysConfigBo config) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = configMapper.lambda()
             .eq(SysConfig::getConfigKey, config.getConfigKey())
             .neIfPresent(SysConfig::getConfigId, config.getConfigId())
             .exists();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
index e5fbd6865..899cadb18 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -46,7 +46,7 @@ import java.util.*;
 @Service
 public class SysDeptServiceImpl implements ISysDeptService, DeptService {
 
-    private final SysDeptMapper baseMapper;
+    private final SysDeptMapper deptMapper;
     private final SysRoleMapper roleMapper;
     private final SysUserMapper userMapper;
 
@@ -59,7 +59,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public PageResult<SysDeptVo> selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) {
-        Page<SysDeptVo> page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept));
+        Page<SysDeptVo> page = deptMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept));
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -72,7 +72,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @Override
     public List<SysDeptVo> selectDeptList(SysDeptBo dept) {
         LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(dept);
-        return baseMapper.selectDeptList(lqw);
+        return deptMapper.selectDeptList(lqw);
     }
 
     /**
@@ -84,7 +84,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @Override
     public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
         LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
-        List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
+        List<SysDeptVo> depts = deptMapper.selectDeptList(lqw);
         return buildDeptTreeSelect(depts);
     }
 
@@ -108,7 +108,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         if (ObjectUtil.isNotNull(bo.getBelongDeptId())) {
             //部门树搜索
             builder.and(x -> {
-                List<Long> deptIds = baseMapper.selectDeptAndChildById(bo.getBelongDeptId());
+                List<Long> deptIds = deptMapper.selectDeptAndChildById(bo.getBelongDeptId());
                 x.in(SysDept::getDeptId, deptIds);
             });
         }
@@ -148,7 +148,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @Override
     public List<Long> selectDeptListByRoleId(Long roleId) {
         SysRole role = roleMapper.selectById(roleId);
-        return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly());
+        return deptMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly());
     }
 
     /**
@@ -160,11 +160,11 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId")
     @Override
     public SysDeptVo selectDeptById(Long deptId) {
-        SysDeptVo dept = baseMapper.selectVoById(deptId);
+        SysDeptVo dept = deptMapper.selectVoById(deptId);
         if (ObjectUtil.isNull(dept)) {
             return null;
         }
-        SysDeptVo parentDept = baseMapper.lambda()
+        SysDeptVo parentDept = deptMapper.lambda()
             .select(SysDept::getDeptName)
             .eq(SysDept::getDeptId, dept.getParentId())
             .voOne();
@@ -180,7 +180,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public List<SysDeptVo> selectDeptByIds(Collection<Long> deptIds) {
-        return baseMapper.selectDeptList(baseMapper.lambda()
+        return deptMapper.selectDeptList(deptMapper.lambda()
             .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader)
             .eq(SysDept::getStatus, SystemConstants.NORMAL)
             .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)
@@ -224,7 +224,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public List<DeptDTO> selectDeptsByList() {
-        List<SysDeptVo> list = baseMapper.selectDeptList(baseMapper.lambda()
+        List<SysDeptVo> list = deptMapper.selectDeptList(deptMapper.lambda()
             .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getParentId)
             .eq(SysDept::getStatus, SystemConstants.NORMAL)
             .build());
@@ -239,7 +239,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public long selectNormalChildrenDeptById(Long deptId) {
-        return baseMapper.lambda()
+        return deptMapper.lambda()
             .eq(SysDept::getStatus, SystemConstants.NORMAL)
             .findInSet(deptId, SysDept::getAncestors)
             .count();
@@ -253,7 +253,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public boolean hasChildByDeptId(Long deptId) {
-        return baseMapper.lambda().eq(SysDept::getParentId, deptId).exists();
+        return deptMapper.lambda().eq(SysDept::getParentId, deptId).exists();
     }
 
     /**
@@ -275,7 +275,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      */
     @Override
     public boolean checkDeptNameUnique(SysDeptBo dept) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = deptMapper.lambda()
             .eq(SysDept::getDeptName, dept.getDeptName())
             .eq(SysDept::getParentId, dept.getParentId())
             .neIfPresent(SysDept::getDeptId, dept.getDeptId())
@@ -296,7 +296,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         if (LoginHelper.isSuperAdmin()) {
             return;
         }
-        if (baseMapper.countDeptById(deptId) == 0) {
+        if (deptMapper.countDeptById(deptId) == 0) {
             throw new ServiceException("没有权限访问部门数据！");
         }
     }
@@ -310,7 +310,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true)
     @Override
     public int insertDept(SysDeptBo bo) {
-        SysDept info = baseMapper.selectById(bo.getParentId());
+        SysDept info = deptMapper.selectById(bo.getParentId());
         // 如果父节点不存在或不为正常状态,则不允许新增子节点
         if (ObjectUtil.isNull(info)) {
             throw new ServiceException("父部门不存在");
@@ -320,7 +320,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         }
         SysDept dept = MapstructUtils.convert(bo, SysDept.class);
         dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId());
-        return baseMapper.insert(dept);
+        return deptMapper.insert(dept);
     }
 
     /**
@@ -337,14 +337,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     @Transactional(rollbackFor = Exception.class)
     public int updateDept(SysDeptBo bo) {
         SysDept dept = MapstructUtils.convert(bo, SysDept.class);
-        SysDept oldDept = baseMapper.selectById(dept.getDeptId());
+        SysDept oldDept = deptMapper.selectById(dept.getDeptId());
         if (ObjectUtil.isNull(oldDept)) {
             throw new ServiceException("部门不存在，无法修改");
         }
         if (!oldDept.getParentId().equals(dept.getParentId())) {
             // 如果是新父部门 则校验是否具有新父部门权限 避免越权
             this.checkDeptDataScope(dept.getParentId());
-            SysDept newParentDept = baseMapper.selectById(dept.getParentId());
+            SysDept newParentDept = deptMapper.selectById(dept.getParentId());
             if (ObjectUtil.isNotNull(newParentDept)) {
                 String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId();
                 String oldAncestors = oldDept.getAncestors();
@@ -354,7 +354,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         } else {
             dept.setAncestors(oldDept.getAncestors());
         }
-        int result = baseMapper.updateById(dept);
+        int result = deptMapper.updateById(dept);
         // 如果部门状态为启用，且部门祖级列表不为空，且部门祖级列表不等于根部门祖级列表（如果部门祖级列表不等于根部门祖级列表，则说明存在上级部门）
         if (SystemConstants.NORMAL.equals(dept.getStatus())
             && StringUtils.isNotEmpty(dept.getAncestors())
@@ -373,7 +373,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     private void updateParentDeptStatusNormal(SysDept dept) {
         String ancestors = dept.getAncestors();
         Long[] deptIds = Convert.toLongArray(ancestors);
-        baseMapper.lambda()
+        deptMapper.lambda()
             .set(SysDept::getStatus, SystemConstants.NORMAL)
             .in(SysDept::getDeptId, Arrays.asList(deptIds))
             .update();
@@ -387,7 +387,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
      * @param oldAncestors 旧的父ID集合
      */
     private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
-        List<SysDept> children = baseMapper.lambda().findInSet(deptId, SysDept::getAncestors).list();
+        List<SysDept> children = deptMapper.lambda().findInSet(deptId, SysDept::getAncestors).list();
         List<SysDept> list = new ArrayList<>();
         for (SysDept child : children) {
             SysDept dept = new SysDept();
@@ -396,7 +396,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
             list.add(dept);
         }
         if (CollUtil.isNotEmpty(list)) {
-            if (baseMapper.updateBatchById(list)) {
+            if (deptMapper.updateBatchById(list)) {
                 list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId()));
             }
         }
@@ -414,7 +414,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
     })
     @Override
     public int deleteDeptById(Long deptId) {
-        return baseMapper.deleteById(deptId);
+        return deptMapper.deleteById(deptId);
     }
 
 
@@ -429,7 +429,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
         if (CollUtil.isEmpty(deptIds)) {
             return Collections.emptyMap();
         }
-        List<SysDept> list = baseMapper.lambda()
+        List<SysDept> list = deptMapper.lambda()
             .select(SysDept::getDeptId, SysDept::getDeptName)
             .in(SysDept::getDeptId, deptIds)
             .list();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
index 22af83a3f..1dba696a6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 @Service
 public class SysDictDataServiceImpl implements ISysDictDataService {
 
-    private final SysDictDataMapper baseMapper;
+    private final SysDictDataMapper dictDataMapper;
 
     /**
      * 分页查询字典数据列表
@@ -42,7 +42,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     @Override
     public PageResult<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) {
         LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
-        Page<SysDictDataVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysDictDataVo> page = dictDataMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -55,7 +55,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     @Override
     public List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData) {
         LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
-        return baseMapper.selectVoList(lqw);
+        return dictDataMapper.selectVoList(lqw);
     }
 
     /**
@@ -82,7 +82,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      */
     @Override
     public String selectDictLabel(String dictType, String dictValue) {
-        return baseMapper.lambda()
+        return dictDataMapper.lambda()
             .select(SysDictData::getDictLabel)
             .eq(SysDictData::getDictType, dictType)
             .eq(SysDictData::getDictValue, dictValue)
@@ -98,7 +98,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      */
     @Override
     public SysDictDataVo selectDictDataById(Long dictCode) {
-        return baseMapper.selectVoById(dictCode);
+        return dictDataMapper.selectVoById(dictCode);
     }
 
     /**
@@ -108,8 +108,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      */
     @Override
     public void deleteDictDataByIds(Collection<Long> dictCodes) {
-        List<SysDictData> list = baseMapper.selectByIds(dictCodes);
-        baseMapper.deleteByIds(dictCodes);
+        List<SysDictData> list = dictDataMapper.selectByIds(dictCodes);
+        dictDataMapper.deleteByIds(dictCodes);
         list.forEach(x -> CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType()));
     }
 
@@ -123,9 +123,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     @Override
     public List<SysDictDataVo> insertDictData(SysDictDataBo bo) {
         SysDictData data = MapstructUtils.convert(bo, SysDictData.class);
-        int row = baseMapper.insert(data);
+        int row = dictDataMapper.insert(data);
         if (row > 0) {
-            return baseMapper.selectDictDataByType(data.getDictType());
+            return dictDataMapper.selectDictDataByType(data.getDictType());
         }
         throw new ServiceException("操作失败");
     }
@@ -140,9 +140,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     @Override
     public List<SysDictDataVo> updateDictData(SysDictDataBo bo) {
         SysDictData data = MapstructUtils.convert(bo, SysDictData.class);
-        int row = baseMapper.updateById(data);
+        int row = dictDataMapper.updateById(data);
         if (row > 0) {
-            return baseMapper.selectDictDataByType(data.getDictType());
+            return dictDataMapper.selectDictDataByType(data.getDictType());
         }
         throw new ServiceException("操作失败");
     }
@@ -155,7 +155,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
      */
     @Override
     public boolean checkDictDataUnique(SysDictDataBo dict) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = dictDataMapper.lambda()
             .eq(SysDictData::getDictType, dict.getDictType())
             .eq(SysDictData::getDictValue, dict.getDictValue())
             .neIfPresent(SysDictData::getDictCode, dict.getDictCode())
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
index d636fec91..7652efecd 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
 @Service
 public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService {
 
-    private final SysDictTypeMapper baseMapper;
+    private final SysDictTypeMapper dictTypeMapper;
     private final SysDictDataMapper dictDataMapper;
 
     /**
@@ -57,7 +57,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Override
     public PageResult<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) {
         LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
-        Page<SysDictTypeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysDictTypeVo> page = dictTypeMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -70,7 +70,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Override
     public List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType) {
         LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
-        return baseMapper.selectVoList(lqw);
+        return dictTypeMapper.selectVoList(lqw);
     }
 
     /**
@@ -94,7 +94,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      */
     @Override
     public List<SysDictTypeVo> selectDictTypeAll() {
-        return baseMapper.selectVoList();
+        return dictTypeMapper.selectVoList();
     }
 
     /**
@@ -118,7 +118,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      */
     @Override
     public SysDictTypeVo selectDictTypeById(Long dictId) {
-        return baseMapper.selectVoById(dictId);
+        return dictTypeMapper.selectVoById(dictId);
     }
 
     /**
@@ -130,7 +130,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Cacheable(cacheNames = CacheNames.SYS_DICT_TYPE, key = "#dictType")
     @Override
     public SysDictTypeVo selectDictTypeByType(String dictType) {
-        return baseMapper.lambda().eq(SysDictType::getDictType, dictType).voOne();
+        return dictTypeMapper.lambda().eq(SysDictType::getDictType, dictType).voOne();
     }
 
     /**
@@ -140,14 +140,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      */
     @Override
     public void deleteDictTypeByIds(Collection<Long> dictIds) {
-        List<SysDictType> list = baseMapper.selectByIds(dictIds);
+        List<SysDictType> list = dictTypeMapper.selectByIds(dictIds);
         list.forEach(x -> {
             boolean assigned = dictDataMapper.lambda().eq(SysDictData::getDictType, x.getDictType()).exists();
             if (assigned) {
                 throw new ServiceException("{}已分配,不能删除", x.getDictName());
             }
         });
-        baseMapper.deleteByIds(dictIds);
+        dictTypeMapper.deleteByIds(dictIds);
         list.forEach(x -> {
             CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType());
             CacheUtils.evict(CacheNames.SYS_DICT_TYPE, x.getDictType());
@@ -173,7 +173,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Override
     public List<SysDictDataVo> insertDictType(SysDictTypeBo bo) {
         SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
-        int row = baseMapper.insert(dict);
+        int row = dictTypeMapper.insert(dict);
         if (row > 0) {
             // 新增 type 下无 data 数据 返回空防止缓存穿透
             return new ArrayList<>();
@@ -192,12 +192,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     @Transactional(rollbackFor = Exception.class)
     public List<SysDictDataVo> updateDictType(SysDictTypeBo bo) {
         SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
-        SysDictType oldDict = baseMapper.selectById(dict.getDictId());
+        SysDictType oldDict = dictTypeMapper.selectById(dict.getDictId());
         dictDataMapper.lambda()
             .set(SysDictData::getDictType, dict.getDictType())
             .eq(SysDictData::getDictType, oldDict.getDictType())
             .update();
-        int row = baseMapper.updateById(dict);
+        int row = dictTypeMapper.updateById(dict);
         if (row > 0) {
             CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType());
             CacheUtils.evict(CacheNames.SYS_DICT_TYPE, oldDict.getDictType());
@@ -214,7 +214,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      */
     @Override
     public boolean checkDictTypeUnique(SysDictTypeBo dictType) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = dictTypeMapper.lambda()
             .eq(SysDictType::getDictType, dictType.getDictType())
             .neIfPresent(SysDictType::getDictId, dictType.getDictId())
             .exists();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java
index 7eae72fef..c8ae64de9 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java
@@ -43,7 +43,7 @@ import java.util.Map;
 @Service
 public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
 
-    private final SysLoginInfoMapper baseMapper;
+    private final SysLoginInfoMapper loginInfoMapper;
 
     private final ISysClientService clientService;
 
@@ -126,7 +126,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
         if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
             lqw.orderByDesc(SysLoginInfo::getInfoId);
         }
-        Page<SysLoginInfoVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysLoginInfoVo> page = loginInfoMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -139,7 +139,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
     public void insertLoginInfo(SysLoginInfoBo bo) {
         SysLoginInfo loginInfo = MapstructUtils.convert(bo, SysLoginInfo.class);
         loginInfo.setLoginTime(LocalDateTime.now());
-        baseMapper.insert(loginInfo);
+        loginInfoMapper.insert(loginInfo);
     }
 
     /**
@@ -150,7 +150,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
      */
     @Override
     public List<SysLoginInfoVo> selectLoginInfoList(SysLoginInfoBo loginInfo) {
-        return baseMapper.selectVoList(buildQueryWrapper(loginInfo)
+        return loginInfoMapper.selectVoList(buildQueryWrapper(loginInfo)
             .orderByDesc(SysLoginInfo::getInfoId));
     }
 
@@ -162,7 +162,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
      */
     private LambdaCrudChainWrapper<SysLoginInfo, SysLoginInfoVo> buildQueryWrapper(SysLoginInfoBo loginInfo) {
         Map<String, Object> params = loginInfo.getParams();
-        return baseMapper.lambda()
+        return loginInfoMapper.lambda()
             .likeIfText(SysLoginInfo::getIpaddr, loginInfo.getIpaddr())
             .eqIfText(SysLoginInfo::getStatus, loginInfo.getStatus())
             .likeIfText(SysLoginInfo::getUserName, loginInfo.getUserName())
@@ -177,7 +177,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
      */
     @Override
     public int deleteLoginInfoByIds(Long[] infoIds) {
-        return baseMapper.deleteByIds(Arrays.asList(infoIds));
+        return loginInfoMapper.deleteByIds(Arrays.asList(infoIds));
     }
 
     /**
@@ -185,6 +185,6 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService {
      */
     @Override
     public void cleanLoginInfo() {
-        baseMapper.lambda().delete();
+        loginInfoMapper.lambda().delete();
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
index ca5483110..1eace2e7a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
@@ -37,7 +37,7 @@ import java.util.*;
 @Service
 public class SysMenuServiceImpl implements ISysMenuService {
 
-    private final SysMenuMapper baseMapper;
+    private final SysMenuMapper menuMapper;
     private final SysRoleMapper roleMapper;
     private final SysRoleMenuMapper roleMenuMapper;
 
@@ -63,7 +63,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     public List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId) {
         // 管理员显示所有菜单信息 不是管理员 按用户id过滤菜单
         if (LoginHelper.isSuperAdmin(userId)) {
-            return baseMapper.lambda()
+            return menuMapper.lambda()
                 .likeIfText(SysMenu::getMenuName, menu.getMenuName())
                 .eqIfText(SysMenu::getVisible, menu.getVisible())
                 .eqIfText(SysMenu::getStatus, menu.getStatus())
@@ -73,7 +73,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 .orderByAsc(SysMenu::getOrderNum)
                 .voList();
         }
-        return baseMapper.selectMenuListByUserId(menu, userId);
+        return menuMapper.selectMenuListByUserId(menu, userId);
     }
 
     /**
@@ -84,7 +84,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public Set<String> selectMenuPermsByUserId(Long userId) {
-        return baseMapper.selectMenuPermsByUserId(userId);
+        return menuMapper.selectMenuPermsByUserId(userId);
     }
 
     /**
@@ -95,7 +95,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public Set<String> selectMenuPermsByRoleId(Long roleId) {
-        return baseMapper.selectMenuPermsByRoleId(roleId);
+        return menuMapper.selectMenuPermsByRoleId(roleId);
     }
 
     /**
@@ -106,7 +106,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public Map<Long, Set<String>> selectMenuPermsByRoleIds(Collection<Long> roleIds) {
-        return baseMapper.selectMenuPermsByRoleIds(roleIds);
+        return menuMapper.selectMenuPermsByRoleIds(roleIds);
     }
 
     /**
@@ -119,9 +119,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
     public List<SysMenu> selectMenuTreeByUserId(Long userId) {
         List<SysMenu> menus;
         if (LoginHelper.isSuperAdmin(userId)) {
-            menus = baseMapper.selectMenuTreeAll();
+            menus = menuMapper.selectMenuTreeAll();
         } else {
-            menus = baseMapper.selectMenuTreeByUserId(userId);
+            menus = menuMapper.selectMenuTreeByUserId(userId);
         }
 
         return TreeBuildUtils.build(menus, Constants.TOP_PARENT_ID, SysMenu::getParentId, (menu, nodeTreeMaps) -> {
@@ -145,7 +145,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public List<Long> selectMenuListByRoleId(Long roleId) {
         SysRole role = roleMapper.selectById(roleId);
-        return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly());
+        return menuMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly());
     }
 
     /**
@@ -234,7 +234,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public SysMenuVo selectMenuById(Long menuId) {
-        return baseMapper.selectVoById(menuId);
+        return menuMapper.selectVoById(menuId);
     }
 
     /**
@@ -245,7 +245,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public boolean hasChildByMenuId(Long menuId) {
-        return baseMapper.lambda().eq(SysMenu::getParentId, menuId).exists();
+        return menuMapper.lambda().eq(SysMenu::getParentId, menuId).exists();
     }
 
     /**
@@ -256,7 +256,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public boolean hasChildByMenuId(Collection<Long> menuIds) {
-        return baseMapper.lambda()
+        return menuMapper.lambda()
             .in(SysMenu::getParentId, menuIds)
             .notIn(SysMenu::getMenuId, menuIds)
             .exists();
@@ -282,7 +282,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public int insertMenu(SysMenuBo bo) {
         SysMenu menu = MapstructUtils.convert(bo, SysMenu.class);
-        return baseMapper.insert(menu);
+        return menuMapper.insert(menu);
     }
 
     /**
@@ -294,7 +294,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public int updateMenu(SysMenuBo bo) {
         SysMenu menu = MapstructUtils.convert(bo, SysMenu.class);
-        return baseMapper.updateById(menu);
+        return menuMapper.updateById(menu);
     }
 
     /**
@@ -305,7 +305,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public int deleteMenuById(Long menuId) {
-        return baseMapper.deleteById(menuId);
+        return menuMapper.deleteById(menuId);
     }
 
     /**
@@ -316,7 +316,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteMenuById(Collection<Long> menuIds) {
-        baseMapper.deleteByIds(menuIds);
+        menuMapper.deleteByIds(menuIds);
         roleMenuMapper.deleteByMenuIds(menuIds);
     }
 
@@ -328,7 +328,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public boolean checkMenuNameUnique(SysMenuBo menu) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = menuMapper.lambda()
             .eq(SysMenu::getMenuName, menu.getMenuName())
             .eq(SysMenu::getParentId, menu.getParentId())
             .neIfPresent(SysMenu::getMenuId, menu.getMenuId())
@@ -352,7 +352,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         Long parentId = menu.getParentId();
         String path = menu.getPath();
         String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName();
-        List<SysMenu> sysMenuList = baseMapper.lambda()
+        List<SysMenu> sysMenuList = menuMapper.lambda()
             .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
             .and(w -> {
                 w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName);
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java
index 4fab4dafd..9c8f2f19e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java
@@ -63,7 +63,7 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService
      */
     private static final long BOX_DAYS = 30L;
 
-    private final SysMessageMapper baseMapper;
+    private final SysMessageMapper messageMapper;
 
     /**
      * 查询当前用户消息盒子数据
@@ -190,7 +190,7 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService
             return payload;
         }
         SysMessage message = buildMessage(userIds, payload);
-        baseMapper.insert(message);
+        messageMapper.insert(message);
         payload.setMessageId(message.getMessageId());
         return payload;
     }
@@ -204,7 +204,7 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService
      * @return 消息VO列表
      */
     private List<SysMessageVo> selectMessageList(String category, Long userId) {
-        List<SysMessage> list = baseMapper.lambda()
+        List<SysMessage> list = messageMapper.lambda()
             .eq(SysMessage::getCategory, category)
             // 仅查询30天内消息
             .ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS))
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
index 977a5c0bd..f48eb566b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
@@ -32,7 +32,7 @@ import java.util.List;
 @Service
 public class SysNoticeServiceImpl implements ISysNoticeService {
 
-    private final SysNoticeMapper baseMapper;
+    private final SysNoticeMapper noticeMapper;
     private final SysUserMapper userMapper;
 
     /**
@@ -45,7 +45,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
     @Override
     public PageResult<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) {
         LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
-        Page<SysNoticeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysNoticeVo> page = noticeMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -57,7 +57,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
      */
     @Override
     public SysNoticeVo selectNoticeById(Long noticeId) {
-        return baseMapper.selectVoById(noticeId);
+        return noticeMapper.selectVoById(noticeId);
     }
 
     /**
@@ -69,7 +69,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
     @Override
     public List<SysNoticeVo> selectNoticeList(SysNoticeBo notice) {
         LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
-        return baseMapper.selectVoList(lqw);
+        return noticeMapper.selectVoList(lqw);
     }
 
     /**
@@ -98,7 +98,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
     @Override
     public int insertNotice(SysNoticeBo bo) {
         SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
-        int rows = baseMapper.insert(notice);
+        int rows = noticeMapper.insert(notice);
         bo.setNoticeId(notice.getNoticeId());
         return rows;
     }
@@ -112,7 +112,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
     @Override
     public int updateNotice(SysNoticeBo bo) {
         SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
-        return baseMapper.updateById(notice);
+        return noticeMapper.updateById(notice);
     }
 
     /**
@@ -123,7 +123,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
      */
     @Override
     public int deleteNoticeById(Long noticeId) {
-        return baseMapper.deleteById(noticeId);
+        return noticeMapper.deleteById(noticeId);
     }
 
     /**
@@ -134,6 +134,6 @@ public class SysNoticeServiceImpl implements ISysNoticeService {
      */
     @Override
     public int deleteNoticeByIds(Long[] noticeIds) {
-        return baseMapper.deleteByIds(Arrays.asList(noticeIds));
+        return noticeMapper.deleteByIds(Arrays.asList(noticeIds));
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
index 6c8bd86c7..153c5d997 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
@@ -34,7 +34,7 @@ import java.util.Map;
 @Service
 public class SysOperLogServiceImpl implements ISysOperLogService {
 
-    private final SysOperLogMapper baseMapper;
+    private final SysOperLogMapper operLogMapper;
 
     /**
      * 操作日志记录
@@ -63,7 +63,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
         if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
             lqw.orderByDesc(SysOperLog::getOperId);
         }
-        Page<SysOperLogVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysOperLogVo> page = operLogMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -106,7 +106,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
     public void insertOperlog(SysOperLogBo bo) {
         SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class);
         operLog.setOperTime(LocalDateTime.now());
-        baseMapper.insert(operLog);
+        operLogMapper.insert(operLog);
     }
 
     /**
@@ -118,7 +118,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
     @Override
     public List<SysOperLogVo> selectOperLogList(SysOperLogBo operLog) {
         LambdaQueryWrapper<SysOperLog> lqw = buildQueryWrapper(operLog);
-        return baseMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId));
+        return operLogMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId));
     }
 
     /**
@@ -129,7 +129,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
      */
     @Override
     public int deleteOperLogByIds(Long[] operIds) {
-        return baseMapper.deleteByIds(Arrays.asList(operIds));
+        return operLogMapper.deleteByIds(Arrays.asList(operIds));
     }
 
     /**
@@ -140,7 +140,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
      */
     @Override
     public SysOperLogVo selectOperLogById(Long operId) {
-        return baseMapper.selectVoById(operId);
+        return operLogMapper.selectVoById(operId);
     }
 
     /**
@@ -148,6 +148,6 @@ public class SysOperLogServiceImpl implements ISysOperLogService {
      */
     @Override
     public void cleanOperLog() {
-        baseMapper.lambda().delete();
+        operLogMapper.lambda().delete();
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
index 985301940..26773808b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
@@ -42,14 +42,14 @@ import java.util.List;
 @Service
 public class SysOssConfigServiceImpl implements ISysOssConfigService {
 
-    private final SysOssConfigMapper baseMapper;
+    private final SysOssConfigMapper ossConfigMapper;
 
     /**
      * 项目启动时，初始化参数到缓存，加载配置类
      */
     @Override
     public void init() {
-        List<SysOssConfig> list = baseMapper.selectList();
+        List<SysOssConfig> list = ossConfigMapper.selectList();
         // 加载OSS初始化配置
         for (SysOssConfig config : list) {
             String configKey = config.getConfigKey();
@@ -68,7 +68,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
      */
     @Override
     public SysOssConfigVo queryById(Long ossConfigId) {
-        return baseMapper.selectVoById(ossConfigId);
+        return ossConfigMapper.selectVoById(ossConfigId);
     }
 
     /**
@@ -81,7 +81,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
     @Override
     public PageResult<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysOssConfig> lqw = buildQueryWrapper(bo);
-        Page<SysOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysOssConfigVo> result = ossConfigMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 
@@ -111,10 +111,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
     public Boolean insertByBo(SysOssConfigBo bo) {
         SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
-        boolean flag = baseMapper.insert(config) > 0;
+        boolean flag = ossConfigMapper.insert(config) > 0;
         if (flag) {
             // 从数据库查询完整的数据做缓存
-            config = baseMapper.selectById(config.getOssConfigId());
+            config = ossConfigMapper.selectById(config.getOssConfigId());
             CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
         }
         return flag;
@@ -130,7 +130,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
     public Boolean updateByBo(SysOssConfigBo bo) {
         SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
-        boolean flag = baseMapper.lambda()
+        boolean flag = ossConfigMapper.lambda()
             .set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, "")
             .set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, "")
             .set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, "")
@@ -139,7 +139,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
             .update(config);
         if (flag) {
             // 从数据库查询完整的数据做缓存
-            config = baseMapper.selectById(config.getOssConfigId());
+            config = ossConfigMapper.selectById(config.getOssConfigId());
             CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
         }
         return flag;
@@ -173,10 +173,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
         }
         List<SysOssConfig> list = CollUtil.newArrayList();
         for (Long configId : ids) {
-            SysOssConfig config = baseMapper.selectById(configId);
+            SysOssConfig config = ossConfigMapper.selectById(configId);
             list.add(config);
         }
-        boolean flag = baseMapper.deleteByIds(ids) > 0;
+        boolean flag = ossConfigMapper.deleteByIds(ids) > 0;
         if (flag) {
             list.forEach(sysOssConfig ->
                 CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey()));
@@ -192,7 +192,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
      */
     private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) {
         long ossConfigId = ObjectUtils.notNull(sysOssConfig.getOssConfigId(), -1L);
-        SysOssConfig info = baseMapper.lambda()
+        SysOssConfig info = ossConfigMapper.lambda()
             .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
             .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())
             .one();
@@ -212,8 +212,8 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
     @Transactional(rollbackFor = Exception.class)
     public int updateOssConfigStatus(SysOssConfigBo bo) {
         SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class);
-        int row = baseMapper.lambda().set(SysOssConfig::getStatus, SystemConstants.NO).updateCount();
-        row += baseMapper.updateById(sysOssConfig);
+        int row = ossConfigMapper.lambda().set(SysOssConfig::getStatus, SystemConstants.NO).updateCount();
+        row += ossConfigMapper.updateById(sysOssConfig);
         if (row > 0) {
             RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey());
         }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 7ad27d599..69cee9e22 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -59,7 +59,7 @@ import java.util.Map;
 @Service
 public class SysOssServiceImpl implements ISysOssService, OssService {
 
-    private final SysOssMapper baseMapper;
+    private final SysOssMapper ossMapper;
 
     /**
      * 查询OSS对象存储列表
@@ -71,7 +71,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     @Override
     public PageResult<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
-        Page<SysOssVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<SysOssVo> result = ossMapper.selectVoPage(pageQuery.build(), lqw);
         List<SysOssVo> filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl);
         result.setRecords(filterResult);
         return PageResult.build(result.getRecords(), result.getTotal());
@@ -178,7 +178,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
     @Override
     public SysOssVo getById(Long ossId) {
-        return baseMapper.selectVoById(ossId);
+        return ossMapper.selectVoById(ossId);
     }
 
 
@@ -284,7 +284,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         oss.setOriginalName(originalfileName);
         oss.setService(configKey);
         oss.setExt1(JsonUtils.toJsonString(ext1));
-        baseMapper.insert(oss);
+        ossMapper.insert(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
         return this.matchingUrl(sysOssVo);
     }
@@ -301,11 +301,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         if (isValid) {
             // 做一些业务上的校验,判断是否需要校验
         }
-        List<SysOss> list = baseMapper.selectByIds(ids);
+        List<SysOss> list = ossMapper.selectByIds(ids);
         for (SysOss sysOss : list) {
             OssFactory.instance(sysOss.getService()).delete(sysOss.getFileName());
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        return ossMapper.deleteByIds(ids) > 0;
     }
 
     /**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
index 924fe2932..e811a798f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
@@ -36,7 +36,7 @@ import java.util.Map;
 @Service
 public class SysPostServiceImpl implements ISysPostService, PostService {
 
-    private final SysPostMapper baseMapper;
+    private final SysPostMapper postMapper;
     private final SysDeptMapper deptMapper;
     private final SysUserPostMapper userPostMapper;
 
@@ -49,7 +49,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public PageResult<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery) {
-        Page<SysPostVo> page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post));
+        Page<SysPostVo> page = postMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post));
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -61,7 +61,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public List<SysPostVo> selectPostList(SysPostBo post) {
-        return baseMapper.selectVoList(buildQueryWrapper(post));
+        return postMapper.selectVoList(buildQueryWrapper(post));
     }
 
     /**
@@ -72,7 +72,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public List<SysPostVo> selectPostsByUserId(Long userId) {
-        return baseMapper.selectPostsByUserId(userId);
+        return postMapper.selectPostsByUserId(userId);
     }
 
     /**
@@ -83,7 +83,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     private Wrapper<SysPost> buildQueryWrapper(SysPostBo bo) {
         Map<String, Object> params = bo.getParams();
-        var wrapper = baseMapper.lambda()
+        var wrapper = postMapper.lambda()
             .likeIfText(SysPost::getPostCode, bo.getPostCode())
             .likeIfText(SysPost::getPostCategory, bo.getPostCategory())
             .likeIfText(SysPost::getPostName, bo.getPostName())
@@ -110,7 +110,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public List<SysPostVo> selectPostAll() {
-        return baseMapper.lambda().voList();
+        return postMapper.lambda().voList();
     }
 
     /**
@@ -121,7 +121,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public SysPostVo selectPostById(Long postId) {
-        return baseMapper.selectVoById(postId);
+        return postMapper.selectVoById(postId);
     }
 
     /**
@@ -132,7 +132,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public List<Long> selectPostListByUserId(Long userId) {
-        List<SysPostVo> list = baseMapper.selectPostsByUserId(userId);
+        List<SysPostVo> list = postMapper.selectPostsByUserId(userId);
         return StreamUtils.toList(list, SysPostVo::getPostId);
     }
 
@@ -144,7 +144,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public List<SysPostVo> selectPostByIds(Collection<Long> postIds) {
-        return baseMapper.lambda()
+        return postMapper.lambda()
             .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode)
             .eq(SysPost::getStatus, SystemConstants.NORMAL)
             .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds)
@@ -159,7 +159,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public boolean checkPostNameUnique(SysPostBo post) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = postMapper.lambda()
             .eq(SysPost::getPostName, post.getPostName())
             .eq(SysPost::getDeptId, post.getDeptId())
             .neIfPresent(SysPost::getPostId, post.getPostId())
@@ -175,7 +175,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public boolean checkPostCodeUnique(SysPostBo post) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = postMapper.lambda()
             .eq(SysPost::getPostCode, post.getPostCode())
             .neIfPresent(SysPost::getPostId, post.getPostId())
             .exists();
@@ -201,7 +201,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public long countPostByDeptId(Long deptId) {
-        return baseMapper.lambda().eq(SysPost::getDeptId, deptId).count();
+        return postMapper.lambda().eq(SysPost::getDeptId, deptId).count();
     }
 
     /**
@@ -212,7 +212,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public int deletePostById(Long postId) {
-        return baseMapper.deleteById(postId);
+        return postMapper.deleteById(postId);
     }
 
     /**
@@ -223,13 +223,13 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
      */
     @Override
     public int deletePostByIds(Collection<Long> postIds) {
-        List<SysPost> list = baseMapper.selectByIds(postIds);
+        List<SysPost> list = postMapper.selectByIds(postIds);
         for (SysPost post : list) {
             if (this.countUserPostById(post.getPostId()) > 0) {
                 throw new ServiceException("{}已分配，不能删除!", post.getPostName());
             }
         }
-        return baseMapper.deleteByIds(postIds);
+        return postMapper.deleteByIds(postIds);
     }
 
     /**
@@ -241,7 +241,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
     @Override
     public int insertPost(SysPostBo bo) {
         SysPost post = MapstructUtils.convert(bo, SysPost.class);
-        return baseMapper.insert(post);
+        return postMapper.insert(post);
     }
 
     /**
@@ -253,7 +253,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
     @Override
     public int updatePost(SysPostBo bo) {
         SysPost post = MapstructUtils.convert(bo, SysPost.class);
-        return baseMapper.updateById(post);
+        return postMapper.updateById(post);
     }
 
     /**
@@ -267,7 +267,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
         if (CollUtil.isEmpty(postIds)) {
             return Collections.emptyMap();
         }
-        List<SysPost> list = baseMapper.lambda()
+        List<SysPost> list = postMapper.lambda()
             .select(SysPost::getPostId, SysPost::getPostName)
             .in(SysPost::getPostId, postIds)
             .list();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
index 7f90187b5..0b59bf510 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
@@ -46,7 +46,7 @@ import java.util.*;
 @Service
 public class SysRoleServiceImpl implements ISysRoleService, RoleService {
 
-    private final SysRoleMapper baseMapper;
+    private final SysRoleMapper roleMapper;
     private final SysRoleMenuMapper roleMenuMapper;
     private final SysUserRoleMapper userRoleMapper;
     private final SysRoleDeptMapper roleDeptMapper;
@@ -60,7 +60,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public PageResult<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery) {
-        Page<SysRoleVo> page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role));
+        Page<SysRoleVo> page = roleMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role));
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -72,7 +72,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public List<SysRoleVo> selectRoleList(SysRoleBo role) {
-        return baseMapper.selectRoleList(this.buildQueryWrapper(role));
+        return roleMapper.selectRoleList(this.buildQueryWrapper(role));
     }
 
     /**
@@ -101,7 +101,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public List<SysRoleVo> selectRolesByUserId(Long userId) {
-        return baseMapper.selectRolesByUserId(userId);
+        return roleMapper.selectRolesByUserId(userId);
     }
 
     /**
@@ -112,7 +112,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public List<SysRoleVo> selectRolesAuthByUserId(Long userId) {
-        List<SysRoleVo> userRoles = baseMapper.selectRolesByUserId(userId);
+        List<SysRoleVo> userRoles = roleMapper.selectRolesByUserId(userId);
         List<SysRoleVo> roles = selectRoleAll();
         // 使用HashSet提高查找效率
         Set<Long> userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId);
@@ -132,7 +132,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public Set<String> selectRolePermissionByUserId(Long userId) {
-        List<SysRoleVo> perms = baseMapper.selectRolesByUserId(userId);
+        List<SysRoleVo> perms = roleMapper.selectRolesByUserId(userId);
         Set<String> permsSet = new HashSet<>();
         for (SysRoleVo perm : perms) {
             if (ObjectUtil.isNotNull(perm)) {
@@ -160,7 +160,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public List<Long> selectRoleListByUserId(Long userId) {
-        List<SysRoleVo> list = baseMapper.selectRolesByUserId(userId);
+        List<SysRoleVo> list = roleMapper.selectRolesByUserId(userId);
         return StreamUtils.toList(list, SysRoleVo::getRoleId);
     }
 
@@ -172,7 +172,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public SysRoleVo selectRoleById(Long roleId) {
-        return baseMapper.selectRoleById(roleId);
+        return roleMapper.selectRoleById(roleId);
     }
 
     /**
@@ -183,7 +183,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public List<SysRoleVo> selectRoleByIds(Collection<Long> roleIds) {
-        return baseMapper.selectRoleList(baseMapper.lambda()
+        return roleMapper.selectRoleList(roleMapper.lambda()
             .eq(SysRole::getStatus, SystemConstants.NORMAL)
             .inIfNotEmpty(SysRole::getRoleId, roleIds)
             .build());
@@ -197,7 +197,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public boolean checkRoleNameUnique(SysRoleBo role) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = roleMapper.lambda()
             .eq(SysRole::getRoleName, role.getRoleName())
             .neIfPresent(SysRole::getRoleId, role.getRoleId())
             .exists();
@@ -212,7 +212,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
      */
     @Override
     public boolean checkRoleKeyUnique(SysRoleBo role) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = roleMapper.lambda()
             .eq(SysRole::getRoleKey, role.getRoleKey())
             .neIfPresent(SysRole::getRoleId, role.getRoleId())
             .exists();
@@ -237,7 +237,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         }
         // 修改不允许修改 管理员标识符
         if (ObjectUtil.isNotNull(role.getRoleId())) {
-            SysRole sysRole = baseMapper.selectById(role.getRoleId());
+            SysRole sysRole = roleMapper.selectById(role.getRoleId());
             // 如果标识符不相等 判断为修改了管理员标识符
             if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) {
                 if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) {
@@ -272,7 +272,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         if (CollUtil.isEmpty(roleIds) || LoginHelper.isSuperAdmin()) {
             return;
         }
-        long count = baseMapper.selectRoleCount(roleIds);
+        long count = roleMapper.selectRoleCount(roleIds);
         if (count != roleIds.size()) {
             throw new ServiceException("没有权限访问部分角色数据！");
         }
@@ -300,7 +300,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
     public int insertRole(SysRoleBo bo) {
         SysRole role = MapstructUtils.convert(bo, SysRole.class);
         // 新增角色信息
-        baseMapper.insert(role);
+        roleMapper.insert(role);
         bo.setRoleId(role.getRoleId());
         return insertRoleMenu(bo);
     }
@@ -320,7 +320,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
             throw new ServiceException("角色已分配，不能禁用!");
         }
         // 仅更新角色基础字段，避免影响权限分配。
-        return baseMapper.updateById(role);
+        return roleMapper.updateById(role);
     }
 
     /**
@@ -335,7 +335,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
     public int updateRolePermission(SysRoleBo bo) {
         SysRole role = MapstructUtils.convert(bo, SysRole.class);
         // 更新权限相关配置字段（数据范围、树联动）。
-        baseMapper.updateById(role);
+        roleMapper.updateById(role);
         // 先清理旧菜单权限，再重建。
         roleMenuMapper.lambda().eq(SysRoleMenu::getRoleId, role.getRoleId()).delete();
         insertRoleMenu(bo);
@@ -356,7 +356,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         if (SystemConstants.DISABLE.equals(status) && this.countUserRoleByRoleId(roleId) > 0) {
             throw new ServiceException("角色已分配，不能禁用!");
         }
-        return baseMapper.lambda()
+        return roleMapper.lambda()
             .set(SysRole::getStatus, status)
             .eq(SysRole::getRoleId, roleId)
             .updateCount();
@@ -420,7 +420,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         roleMenuMapper.lambda().eq(SysRoleMenu::getRoleId, roleId).delete();
         // 删除角色与部门关联
         roleDeptMapper.lambda().eq(SysRoleDept::getRoleId, roleId).delete();
-        return baseMapper.deleteById(roleId);
+        return roleMapper.deleteById(roleId);
     }
 
     /**
@@ -434,7 +434,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
     @Transactional(rollbackFor = Exception.class)
     public int deleteRoleByIds(Collection<Long> roleIds) {
         this.checkRoleDataScope(roleIds);
-        List<SysRole> roles = baseMapper.selectByIds(roleIds);
+        List<SysRole> roles = roleMapper.selectByIds(roleIds);
         for (SysRole role : roles) {
             checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class));
             if (countUserRoleByRoleId(role.getRoleId()) > 0) {
@@ -445,7 +445,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         roleMenuMapper.lambda().in(SysRoleMenu::getRoleId, roleIds).delete();
         // 删除角色与部门关联
         roleDeptMapper.lambda().in(SysRoleDept::getRoleId, roleIds).delete();
-        return baseMapper.deleteByIds(roleIds);
+        return roleMapper.deleteByIds(roleIds);
     }
 
     /**
@@ -609,7 +609,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
         if (CollUtil.isEmpty(roleIds)) {
             return Collections.emptyMap();
         }
-        List<SysRole> list = baseMapper.lambda()
+        List<SysRole> list = roleMapper.lambda()
             .select(SysRole::getRoleId, SysRole::getRoleName)
             .in(SysRole::getRoleId, roleIds)
             .list();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java
index b58b1d187..b03870f3e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java
@@ -21,7 +21,7 @@ import java.util.List;
 @Service
 public class SysSocialServiceImpl implements ISysSocialService {
 
-    private final SysSocialMapper baseMapper;
+    private final SysSocialMapper socialMapper;
 
 
     /**
@@ -32,7 +32,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
      */
     @Override
     public SysSocialVo queryById(String id) {
-        return baseMapper.selectVoById(id);
+        return socialMapper.selectVoById(id);
     }
 
     /**
@@ -43,7 +43,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
      */
     @Override
     public List<SysSocialVo> queryList(SysSocialBo bo) {
-        return baseMapper.lambda()
+        return socialMapper.lambda()
             .eqIfPresent(SysSocial::getUserId, bo.getUserId())
             .eqIfText(SysSocial::getAuthId, bo.getAuthId())
             .eqIfText(SysSocial::getSource, bo.getSource())
@@ -58,7 +58,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
      */
     @Override
     public List<SysSocialVo> queryListByUserId(Long userId) {
-        return baseMapper.lambda().eq(SysSocial::getUserId, userId).voList();
+        return socialMapper.lambda().eq(SysSocial::getUserId, userId).voList();
     }
 
 
@@ -72,7 +72,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
     public Boolean insertByBo(SysSocialBo bo) {
         SysSocial add = MapstructUtils.convert(bo, SysSocial.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = socialMapper.insert(add) > 0;
         if (flag) {
             if (add != null) {
                 bo.setId(add.getId());
@@ -93,7 +93,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
     public Boolean updateByBo(SysSocialBo bo) {
         SysSocial update = MapstructUtils.convert(bo, SysSocial.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return socialMapper.updateById(update) > 0;
     }
 
     /**
@@ -114,7 +114,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
      */
     @Override
     public Boolean deleteWithValidById(Long id) {
-        return baseMapper.deleteById(id) > 0;
+        return socialMapper.deleteById(id) > 0;
     }
 
 
@@ -126,7 +126,7 @@ public class SysSocialServiceImpl implements ISysSocialService {
      */
     @Override
     public List<SysSocialVo> selectByAuthId(String authId) {
-        return baseMapper.lambda().eq(SysSocial::getAuthId, authId).voList();
+        return socialMapper.lambda().eq(SysSocial::getAuthId, authId).voList();
     }
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
index 52a09c868..f49086482 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -47,7 +47,7 @@ import java.util.*;
 @Service
 public class SysUserServiceImpl implements ISysUserService, UserService {
 
-    private final SysUserMapper baseMapper;
+    private final SysUserMapper userMapper;
     private final SysDeptMapper deptMapper;
     private final SysRoleMapper roleMapper;
     private final SysPostMapper postMapper;
@@ -63,7 +63,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public PageResult<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
-        Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
+        Page<SysUserVo> page = userMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -76,7 +76,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public List<SysUserExportVo> selectUserExportList(SysUserBo user) {
         List<Long> deptIds = ObjectUtil.isNotNull(user.getDeptId()) ? deptMapper.selectDeptAndChildById(user.getDeptId()) : null;
-        return baseMapper.selectUserExportList(user, deptIds);
+        return userMapper.selectUserExportList(user, deptIds);
     }
 
     /**
@@ -116,7 +116,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public PageResult<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
-        Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
+        Page<SysUserVo> page = userMapper.selectAllocatedList(pageQuery.build(), user);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -129,7 +129,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     public PageResult<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
         List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
-        Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), user, userIds);
+        Page<SysUserVo> page = userMapper.selectUnallocatedList(pageQuery.build(), user, userIds);
         return PageResult.build(page.getRecords(), page.getTotal());
     }
 
@@ -141,7 +141,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public SysUserVo selectUserByUserName(String userName) {
-        return baseMapper.lambda().eq(SysUser::getUserName, userName).voOne();
+        return userMapper.lambda().eq(SysUser::getUserName, userName).voOne();
     }
 
     /**
@@ -152,7 +152,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public SysUserVo selectUserByPhoneNumber(String phoneNumber) {
-        return baseMapper.lambda().eq(SysUser::getPhoneNumber, phoneNumber).voOne();
+        return userMapper.lambda().eq(SysUser::getPhoneNumber, phoneNumber).voOne();
     }
 
     /**
@@ -163,7 +163,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public SysUserVo selectUserById(Long userId) {
-        SysUserVo user = baseMapper.selectVoById(userId);
+        SysUserVo user = userMapper.selectVoById(userId);
         if (ObjectUtil.isNull(user)) {
             return user;
         }
@@ -180,7 +180,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public List<SysUserVo> selectUserByIds(Collection<Long> userIds, Long deptId) {
-        return baseMapper.selectUserList(baseMapper.lambda()
+        return userMapper.selectUserList(userMapper.lambda()
             .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
             .eq(SysUser::getStatus, SystemConstants.NORMAL)
             .eqIfPresent(SysUser::getDeptId, deptId)
@@ -226,7 +226,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public boolean checkUserNameUnique(SysUserBo user) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = userMapper.lambda()
             .eq(SysUser::getUserName, user.getUserName())
             .neIfPresent(SysUser::getUserId, user.getUserId())
             .exists();
@@ -240,7 +240,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public boolean checkPhoneUnique(SysUserBo user) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = userMapper.lambda()
             .eq(SysUser::getPhoneNumber, user.getPhoneNumber())
             .neIfPresent(SysUser::getUserId, user.getUserId())
             .exists();
@@ -254,7 +254,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public boolean checkEmailUnique(SysUserBo user) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = userMapper.lambda()
             .eq(SysUser::getEmail, user.getEmail())
             .neIfPresent(SysUser::getUserId, user.getUserId())
             .exists();
@@ -286,7 +286,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         if (LoginHelper.isSuperAdmin()) {
             return;
         }
-        if (baseMapper.countUserById(userId) == 0) {
+        if (userMapper.countUserById(userId) == 0) {
             throw new ServiceException("没有权限访问用户数据！");
         }
     }
@@ -302,7 +302,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     public int insertUser(SysUserBo user) {
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         // 新增用户信息
-        int rows = baseMapper.insert(sysUser);
+        int rows = userMapper.insert(sysUser);
         user.setUserId(sysUser.getUserId());
         // 新增用户岗位关联
         insertUserPost(user, false);
@@ -322,7 +322,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         user.setCreateBy(0L);
         user.setUpdateBy(0L);
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
-        return baseMapper.insert(sysUser) > 0;
+        return userMapper.insert(sysUser) > 0;
     }
 
     /**
@@ -341,7 +341,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         insertUserPost(user, true);
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
         // 防止错误更新后导致的数据误删除
-        int flag = baseMapper.updateById(sysUser);
+        int flag = userMapper.updateById(sysUser);
         if (flag < 1) {
             throw new ServiceException("修改用户{}信息失败", user.getUserName());
         }
@@ -369,7 +369,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public int updateUserStatus(Long userId, String status) {
-        return baseMapper.lambda()
+        return userMapper.lambda()
             .set(SysUser::getStatus, status)
             .eq(SysUser::getUserId, userId)
             .updateCount();
@@ -384,7 +384,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")
     @Override
     public int updateUserProfile(SysUserBo user) {
-        return baseMapper.lambda()
+        return userMapper.lambda()
             .setIfPresent(SysUser::getNickName, user.getNickName())
             .set(SysUser::getPhoneNumber, user.getPhoneNumber())
             .set(SysUser::getEmail, user.getEmail())
@@ -402,7 +402,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public boolean updateUserAvatar(Long userId, Long avatar) {
-        return baseMapper.lambda()
+        return userMapper.lambda()
             .set(SysUser::getAvatar, avatar)
             .eq(SysUser::getUserId, userId)
             .update();
@@ -417,7 +417,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public int resetUserPwd(Long userId, String password) {
-        return baseMapper.lambda()
+        return userMapper.lambda()
             .set(SysUser::getPassword, password)
             .eq(SysUser::getUserId, userId)
             .updateCount();
@@ -526,7 +526,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         // 删除用户与岗位表
         userPostMapper.lambda().eq(SysUserPost::getUserId, userId).delete();
         // 防止更新失败导致的数据删除
-        int flag = baseMapper.deleteById(userId);
+        int flag = userMapper.deleteById(userId);
         if (flag < 1) {
             throw new ServiceException("删除用户失败!");
         }
@@ -552,7 +552,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         // 删除用户与岗位表
         userPostMapper.lambda().in(SysUserPost::getUserId, ids).delete();
         // 防止更新失败导致的数据删除
-        int flag = baseMapper.deleteByIds(ids);
+        int flag = userMapper.deleteByIds(ids);
         if (flag < 1) {
             throw new ServiceException("删除用户失败!");
         }
@@ -567,7 +567,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public List<SysUserVo> selectUserListByDept(Long deptId) {
-        return baseMapper.lambda()
+        return userMapper.lambda()
             .eq(SysUser::getDeptId, deptId)
             .orderByAsc(SysUser::getUserId)
             .voList();
@@ -582,7 +582,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
     @Override
     public String selectUserNameById(Long userId) {
-        SysUser sysUser = baseMapper.lambda()
+        SysUser sysUser = userMapper.lambda()
             .select(SysUser::getUserName)
             .eq(SysUser::getUserId, userId)
             .one();
@@ -598,7 +598,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Override
     @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId")
     public String selectNicknameById(Long userId) {
-        SysUser sysUser = baseMapper.lambda()
+        SysUser sysUser = userMapper.lambda()
             .select(SysUser::getNickName)
             .eq(SysUser::getUserId, userId)
             .one();
@@ -631,7 +631,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public String selectPhonenumberById(Long userId) {
-        SysUser sysUser = baseMapper.lambda()
+        SysUser sysUser = userMapper.lambda()
             .select(SysUser::getPhoneNumber)
             .eq(SysUser::getUserId, userId)
             .one();
@@ -646,7 +646,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public String selectEmailById(Long userId) {
-        SysUser sysUser = baseMapper.lambda()
+        SysUser sysUser = userMapper.lambda()
             .select(SysUser::getEmail)
             .eq(SysUser::getUserId, userId)
             .one();
@@ -661,7 +661,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public UserDTO selectById(Long userId) {
-        SysUserVo vo = baseMapper.lambda()
+        SysUserVo vo = userMapper.lambda()
             .select(SysUser::getUserId, SysUser::getDeptId, SysUser::getUserName,
                 SysUser::getNickName, SysUser::getUserType, SysUser::getEmail,
                 SysUser::getPhoneNumber, SysUser::getGender, SysUser::getStatus,
@@ -683,7 +683,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         if (CollUtil.isEmpty(userIds)) {
             return List.of();
         }
-        List<SysUserVo> list = baseMapper.lambda()
+        List<SysUserVo> list = userMapper.lambda()
             .select(SysUser::getUserId, SysUser::getDeptId, SysUser::getUserName,
                 SysUser::getNickName, SysUser::getUserType, SysUser::getEmail,
                 SysUser::getPhoneNumber, SysUser::getGender, SysUser::getStatus,
@@ -741,7 +741,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         if (CollUtil.isEmpty(deptIds)) {
             return List.of();
         }
-        List<SysUserVo> list = baseMapper.lambda()
+        List<SysUserVo> list = userMapper.lambda()
             .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhoneNumber)
             .eq(SysUser::getStatus, SystemConstants.NORMAL)
             .in(SysUser::getDeptId, deptIds)
@@ -781,7 +781,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         if (CollUtil.isEmpty(userIds)) {
             return Collections.emptyMap();
         }
-        List<SysUser> list = baseMapper.lambda()
+        List<SysUser> list = userMapper.lambda()
             .select(SysUser::getUserId, SysUser::getNickName)
             .in(SysUser::getUserId, userIds)
             .list();
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
index 3b3eeaabb..13d182ea1 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
@@ -38,7 +38,7 @@ import java.util.*;
 public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryService {
 
     private final DefService defService;
-    private final FlwCategoryMapper baseMapper;
+    private final FlwCategoryMapper categoryMapper;
 
     /**
      * 查询流程分类
@@ -48,7 +48,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
      */
     @Override
     public FlowCategoryVo queryById(Long categoryId) {
-        return baseMapper.selectVoById(categoryId);
+        return categoryMapper.selectVoById(categoryId);
     }
 
     /**
@@ -63,7 +63,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
         if (ObjectUtil.isNull(categoryId)) {
             return null;
         }
-        FlowCategory category = baseMapper.lambda()
+        FlowCategory category = categoryMapper.lambda()
             .select(FlowCategory::getCategoryName)
             .eq(FlowCategory::getCategoryId, categoryId)
             .one();
@@ -81,7 +81,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
         if (CollUtil.isEmpty(categoryIds)) {
             return Collections.emptyMap();
         }
-        List<FlowCategory> list = baseMapper.lambda()
+        List<FlowCategory> list = categoryMapper.lambda()
             .select(FlowCategory::getCategoryId, FlowCategory::getCategoryName)
             .in(FlowCategory::getCategoryId, categoryIds)
             .list();
@@ -97,7 +97,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
     @Override
     public List<FlowCategoryVo> queryList(FlowCategoryBo bo) {
         LambdaQueryWrapper<FlowCategory> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return categoryMapper.selectVoList(lqw);
     }
 
     /**
@@ -147,7 +147,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
      */
     @Override
     public boolean checkCategoryNameUnique(FlowCategoryBo category) {
-        boolean exist = baseMapper.lambda()
+        boolean exist = categoryMapper.lambda()
             .eq(FlowCategory::getCategoryName, category.getCategoryName())
             .eq(FlowCategory::getParentId, category.getParentId())
             .neIfPresent(FlowCategory::getCategoryId, category.getCategoryId())
@@ -176,7 +176,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
      */
     @Override
     public boolean hasChildByCategoryId(Long categoryId) {
-        return baseMapper.lambda().eq(FlowCategory::getParentId, categoryId).exists();
+        return categoryMapper.lambda().eq(FlowCategory::getParentId, categoryId).exists();
     }
 
     /**
@@ -206,13 +206,13 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
      */
     @Override
     public int insertByBo(FlowCategoryBo bo) {
-        FlowCategory info = baseMapper.selectById(bo.getParentId());
+        FlowCategory info = categoryMapper.selectById(bo.getParentId());
         if (ObjectUtil.isNull(info)) {
             throw new ServiceException("父级流程分类不存在!");
         }
         FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class);
         category.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + category.getParentId());
-        return baseMapper.insert(category);
+        return categoryMapper.insert(category);
     }
 
     /**
@@ -226,7 +226,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
     @Transactional(rollbackFor = Exception.class)
     public int updateByBo(FlowCategoryBo bo) {
         FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class);
-        FlowCategory oldCategory = baseMapper.selectById(category.getCategoryId());
+        FlowCategory oldCategory = categoryMapper.selectById(category.getCategoryId());
         if (ObjectUtil.isNull(oldCategory)) {
             throw new ServiceException("流程分类不存在，无法修改");
         }
@@ -234,7 +234,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
             throw new ServiceException("不允许修改顶级分类的父级节点");
         }
         if (!oldCategory.getParentId().equals(category.getParentId())) {
-            FlowCategory newParentCategory = baseMapper.selectById(category.getParentId());
+            FlowCategory newParentCategory = categoryMapper.selectById(category.getParentId());
             if (ObjectUtil.isNotNull(newParentCategory)) {
                 String newAncestors = newParentCategory.getAncestors() + StringUtils.SEPARATOR + newParentCategory.getCategoryId();
                 String oldAncestors = oldCategory.getAncestors();
@@ -246,7 +246,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
         } else {
             category.setAncestors(oldCategory.getAncestors());
         }
-        return baseMapper.updateById(category);
+        return categoryMapper.updateById(category);
     }
 
     /**
@@ -257,7 +257,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
      * @param oldAncestors 旧的父ID集合
      */
     private void updateCategoryChildren(Long categoryId, String newAncestors, String oldAncestors) {
-        List<FlowCategory> children = baseMapper.lambda()
+        List<FlowCategory> children = categoryMapper.lambda()
             .findInSet(categoryId, FlowCategory::getAncestors)
             .list();
         List<FlowCategory> list = new ArrayList<>();
@@ -268,7 +268,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
             list.add(category);
         }
         if (CollUtil.isNotEmpty(list)) {
-            baseMapper.updateBatchById(list);
+            categoryMapper.updateBatchById(list);
         }
     }
 
@@ -281,6 +281,6 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService, CategoryServ
     @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId")
     @Override
     public int deleteWithValidById(Long categoryId) {
-        return baseMapper.deleteById(categoryId);
+        return categoryMapper.deleteById(categoryId);
     }
 }
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java
index 5745df8bf..79c6839fa 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java
@@ -40,7 +40,7 @@ import java.util.Map;
 @Service
 public class FlwSpelServiceImpl implements IFlwSpelService {
 
-    private final FlwSpelMapper baseMapper;
+    private final FlwSpelMapper spelMapper;
 
     /**
      * 查询流程spel表达式定义
@@ -50,7 +50,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
      */
     @Override
     public FlowSpelVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        return spelMapper.selectVoById(id);
     }
 
     /**
@@ -63,7 +63,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
     @Override
     public PageResult<FlowSpelVo> queryPageList(FlowSpelBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<FlowSpel> lqw = buildQueryWrapper(bo);
-        Page<FlowSpelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<FlowSpelVo> result = spelMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 
@@ -76,7 +76,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
     @Override
     public List<FlowSpelVo> queryList(FlowSpelBo bo) {
         LambdaQueryWrapper<FlowSpel> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return spelMapper.selectVoList(lqw);
     }
 
     /**
@@ -107,7 +107,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
     public Boolean insertByBo(FlowSpelBo bo) {
         FlowSpel add = MapstructUtils.convert(bo, FlowSpel.class);
         validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = spelMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -124,7 +124,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
     public Boolean updateByBo(FlowSpelBo bo) {
         FlowSpel update = MapstructUtils.convert(bo, FlowSpel.class);
         validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        return spelMapper.updateById(update) > 0;
     }
 
     /**
@@ -134,7 +134,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
      */
     private void validEntityBeforeSave(FlowSpel entity){
         if (StringUtils.isNotBlank(entity.getViewSpel())) {
-            boolean exists = baseMapper.lambda()
+            boolean exists = spelMapper.lambda()
                 .eq(FlowSpel::getViewSpel, entity.getViewSpel())
                 .neIfPresent(FlowSpel::getId, entity.getId())
                 .exists();
@@ -156,7 +156,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
         if (isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return baseMapper.deleteByIds(ids) > 0;
+        return spelMapper.deleteByIds(ids) > 0;
     }
 
     /**
@@ -193,7 +193,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService {
         if (CollUtil.isEmpty(viewSpels)) {
             return Collections.emptyMap();
         }
-        List<FlowSpel> list = baseMapper.lambda()
+        List<FlowSpel> list = spelMapper.lambda()
             .select(FlowSpel::getViewSpel, FlowSpel::getRemark)
             .in(FlowSpel::getViewSpel, viewSpels)
             .list();
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index 29db4112b..84b79a701 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -50,7 +50,7 @@ import java.util.Map;
 @Slf4j
 public class TestLeaveServiceImpl implements ITestLeaveService {
 
-    private final TestLeaveMapper baseMapper;
+    private final TestLeaveMapper leaveMapper;
     private final WorkflowService workflowService;
 
     /**
@@ -74,7 +74,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
      */
     @Override
     public TestLeaveVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        return leaveMapper.selectVoById(id);
     }
 
     /**
@@ -87,7 +87,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @Override
     public PageResult<TestLeaveVo> queryPageList(TestLeaveBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TestLeave> lqw = buildQueryWrapper(bo);
-        Page<TestLeaveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<TestLeaveVo> result = leaveMapper.selectVoPage(pageQuery.build(), lqw);
         return PageResult.build(result.getRecords(), result.getTotal());
     }
 
@@ -100,7 +100,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @Override
     public List<TestLeaveVo> queryList(TestLeaveBo bo) {
         LambdaQueryWrapper<TestLeave> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return leaveMapper.selectVoList(lqw);
     }
 
     /**
@@ -134,7 +134,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
         if (StringUtils.isBlank(add.getStatus())) {
             add.setStatus(BusinessStatusEnum.DRAFT.getStatus());
         }
-        boolean flag = baseMapper.insert(add) > 0;
+        boolean flag = leaveMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
         }
@@ -157,7 +157,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
             bo.setApplyCode(System.currentTimeMillis() + StrUtil.EMPTY);
         }
         TestLeave leave = MapstructUtils.convert(bo, TestLeave.class);
-        boolean flag = baseMapper.insertOrUpdate(leave);
+        boolean flag = leaveMapper.insertOrUpdate(leave);
         if (flag) {
             bo.setId(leave.getId());
             // 后端发起需要忽略权限
@@ -187,7 +187,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @Override
     public TestLeaveVo updateByBo(TestLeaveBo bo) {
         TestLeave update = MapstructUtils.convert(bo, TestLeave.class);
-        baseMapper.updateById(update);
+        leaveMapper.updateById(update);
         return MapstructUtils.convert(update, TestLeaveVo.class);
     }
 
@@ -201,7 +201,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids) {
         workflowService.deleteInstance(StreamUtils.toList(ids, Convert::toStr));
-        return baseMapper.deleteByIds(ids) > 0;
+        return leaveMapper.deleteByIds(ids) > 0;
     }
 
     /**
@@ -214,7 +214,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @EventListener(condition = "#processEvent.flowCode.startsWith('leave')")
     public void processHandler(ProcessEvent processEvent) {
         log.info("当前任务执行了{}", processEvent.toString());
-        TestLeave testLeave = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
+        TestLeave testLeave = leaveMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
         testLeave.setStatus(processEvent.getStatus());
         // 用于例如审批附件 审批意见等 存储到业务表内 自行根据业务实现存储流程
         Map<String, Object> params = processEvent.getParams();
@@ -236,7 +236,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
         }
         String status = BusinessStatusEnum.findByStatus(processEvent.getStatus());
         log.info("当前流程状态为{}", status);
-        baseMapper.updateById(testLeave);
+        leaveMapper.updateById(testLeave);
     }
 
     /**
@@ -264,11 +264,11 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
     @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')")
     public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
         log.info("监听删除流程事件，当前任务执行了{}", processDeleteEvent.toString());
-        TestLeave testLeave = baseMapper.selectById(Convert.toLong(processDeleteEvent.getBusinessId()));
+        TestLeave testLeave = leaveMapper.selectById(Convert.toLong(processDeleteEvent.getBusinessId()));
         if (ObjectUtil.isNull(testLeave)) {
             return;
         }
-        baseMapper.deleteById(testLeave.getId());
+        leaveMapper.deleteById(testLeave.getId());
     }
 
 }