diff --git a/src/main/resources/vms/server/controller/controller.java.vm b/src/main/resources/vms/server/controller/controller.java.vm
index c1af1df..cd8d4b4 100644
--- a/src/main/resources/vms/server/controller/controller.java.vm
+++ b/src/main/resources/vms/server/controller/controller.java.vm
@@ -1,7 +1,7 @@
 package ${package}.controller;
 
 import ${package}.domain.dto.${classUppercaseName}Dto;
-import ${package}.domain.entity.${classUppercaseName};
+import ${package}.domain.entity.${classUppercaseName}Entity;
 import ${package}.domain.vo.${classUppercaseName}Vo;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -41,7 +41,7 @@ public class ${classUppercaseName}Controller {
             @Parameter(name = "limit", description = "每页记录数", required = true)
             @PathVariable("limit") Integer limit,
             ${classUppercaseName}Dto dto) {
-        Page<${classUppercaseName}> pageParams = new Page<>(page, limit);
+        Page<${classUppercaseName}Entity> pageParams = new Page<>(page, limit);
         PageResult<${classUppercaseName}Vo> pageResult = ${classLowercaseName}Service.get${classUppercaseName}Page(pageParams, dto);
         return Result.success(pageResult);
     }
diff --git a/src/main/resources/vms/server/mapper/mapper.java.vm b/src/main/resources/vms/server/mapper/mapper.java.vm
index 343733f..0b3f0e5 100644
--- a/src/main/resources/vms/server/mapper/mapper.java.vm
+++ b/src/main/resources/vms/server/mapper/mapper.java.vm
@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import ${package}.domain.dto.${classUppercaseName}Dto;
-import ${package}.domain.entity.${classUppercaseName};
+import ${package}.domain.entity.${classUppercaseName}Entity;
 import ${package}.domain.vo.${classUppercaseName}Vo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -23,7 +23,7 @@ import java.util.List;
  * @since ${date}
  */
 @Mapper
-public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercaseName}> {
+public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercaseName}Entity> {
 
     /**
      * * 分页查询${comment}内容
@@ -32,6 +32,6 @@ public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercase
      * @param dto        ${comment}查询表单
      * @return ${comment}分页结果
      */
-    IPage<${classUppercaseName}Vo> selectListByPage(@Param("page") Page<${classUppercaseName}> pageParams, @Param("dto") ${classUppercaseName}Dto dto);
+    IPage<${classUppercaseName}Vo> selectListByPage(@Param("page") Page<${classUppercaseName}Entity> pageParams, @Param("dto") ${classUppercaseName}Dto dto);
 
 }
diff --git a/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm b/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
index 0471987..ba1e6ed 100644
--- a/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
+++ b/src/main/resources/vms/server/mapper/mapper/resourceMapper.xml.vm
@@ -3,7 +3,7 @@
 <mapper namespace="${package}.mapper.${classUppercaseName}Mapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="${package}.domain.entity.${classUppercaseName}">
+    <resultMap id="BaseResultMap" type="${package}.domain.entity.${classUppercaseName}Entity">
         #foreach($field in ${columnInfoList})
             <id column="${field.columnName}" property="${field.lowercaseName}"/>
         #end
diff --git a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm
index bbed6d1..e3af511 100644
--- a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm
+++ b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ${package}.service.${classUppercaseName}Service;
 import ${package}.domain.dto.${classUppercaseName}Dto;
-import ${package}.domain.entity.${classUppercaseName};
+import ${package}.domain.entity.${classUppercaseName}Entity;
 import ${package}.domain.vo.${classUppercaseName}Vo;
 import ${package}.domain.vo.result.PageResult;
 import ${package}.domain.vo.result.Result;
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Service
 @Transactional
-public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUppercaseName}Mapper, ${classUppercaseName}> implements ${classUppercaseName}Service {
+public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUppercaseName}Mapper, ${classUppercaseName}Entity> implements ${classUppercaseName}Service {
 
     /**
      * * ${comment} 服务实现类
@@ -37,7 +37,7 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca
      * @return 查询分页${comment}返回对象
      */
     @Override
-    public PageResult<${classUppercaseName}Vo> get${classUppercaseName}Page(Page<${classUppercaseName}> pageParams, ${classUppercaseName}Dto dto) {
+    public PageResult<${classUppercaseName}Vo> get${classUppercaseName}Page(Page<${classUppercaseName}Entity> pageParams, ${classUppercaseName}Dto dto) {
         IPage<${classUppercaseName}Vo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<${classUppercaseName}Vo>builder()
@@ -55,7 +55,7 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca
      */
     @Override
     public void add${classUppercaseName}(${classUppercaseName}Dto dto) {
-        ${classUppercaseName} ${classLowercaseName} =new ${classUppercaseName}();
+            ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity();
         BeanUtils.copyProperties(dto, ${classLowercaseName});
         save(${classLowercaseName});
     }
@@ -67,7 +67,7 @@ public class ${classUppercaseName}ServiceImpl extends ServiceImpl<${classUpperca
      */
     @Override
     public void update${classUppercaseName}(${classUppercaseName}Dto dto) {
-        ${classUppercaseName} ${classLowercaseName} =new ${classUppercaseName}();
+            ${classUppercaseName}Entity ${classLowercaseName} = new ${classUppercaseName}Entity();
         BeanUtils.copyProperties(dto, ${classLowercaseName});
         updateById(${classLowercaseName});
     }
diff --git a/src/main/resources/vms/server/service/service.java.vm b/src/main/resources/vms/server/service/service.java.vm
index cd2575a..875ca86 100644
--- a/src/main/resources/vms/server/service/service.java.vm
+++ b/src/main/resources/vms/server/service/service.java.vm
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import ${package}.domain.dto.${classUppercaseName}Dto;
-import ${package}.domain.entity.${classUppercaseName};
+import ${package}.domain.entity.${classUppercaseName}Entity;
 import ${package}.domain.vo.${classUppercaseName}Vo;
 import ${package}.domain.vo.result.PageResult;
 import ${package}.domain.vo.result.Result;
@@ -19,14 +19,14 @@ import java.util.List;
  * @author Bunny
  * @since ${date}
  */
-public interface ${classUppercaseName}Service extends IService<${classUppercaseName}> {
+public interface ${classUppercaseName}Service extends IService<${classUppercaseName}Entity> {
 
     /**
      * 分页查询${comment}
      *
      * @return {@link ${classUppercaseName}Vo}
      */
-    PageResult<${classUppercaseName}Vo> get${classUppercaseName}Page(Page<${classUppercaseName}> pageParams, ${classUppercaseName}Dto dto);
+    PageResult<${classUppercaseName}Vo> get${classUppercaseName}Page(Page<${classUppercaseName}Entity> pageParams, ${classUppercaseName}Dto dto);
 
     /**
      * 添加${comment}