diff --git a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
index fcc28cb5..604cf2db 100644
--- a/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
+++ b/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java
@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -87,8 +88,8 @@ public class GeneratorServiceImpl implements GeneratorService {
                 "where table_schema = (select database()) and table_name like :table";
         Query queryCount = em.createNativeQuery(countSql);
         queryCount.setParameter("table", StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
-        long totalElements = (long) queryCount.getSingleResult();
-        return PageUtil.toPage(tableInfos, totalElements);
+        BigInteger totalElements = (BigInteger) queryCount.getSingleResult();
+        return PageUtil.toPage(tableInfos, totalElements.longValue());
     }
 
     @Override
diff --git a/eladmin-generator/src/main/resources/template/admin/Controller.ftl b/eladmin-generator/src/main/resources/template/admin/Controller.ftl
index 5af73ddb..a7d6d754 100644
--- a/eladmin-generator/src/main/resources/template/admin/Controller.ftl
+++ b/eladmin-generator/src/main/resources/template/admin/Controller.ftl
@@ -29,6 +29,8 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import me.zhengjie.utils.PageResult;
+import ${package}.service.dto.${className}Dto;
 
 /**
 * @website https://eladmin.vip
@@ -55,7 +57,7 @@ public class ${className}Controller {
     @Log("查询${apiAlias}")
     @ApiOperation("查询${apiAlias}")
     @PreAuthorize("@el.check('${changeClassName}:list')")
-    public ResponseEntity<Object> query${className}(${className}QueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<PageResult<${className}Dto>> query${className}(${className}QueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(${changeClassName}Service.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
@@ -64,7 +66,8 @@ public class ${className}Controller {
     @ApiOperation("新增${apiAlias}")
     @PreAuthorize("@el.check('${changeClassName}:add')")
     public ResponseEntity<Object> create${className}(@Validated @RequestBody ${className} resources){
-        return new ResponseEntity<>(${changeClassName}Service.create(resources),HttpStatus.CREATED);
+        ${changeClassName}Service.create(resources);
+        return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
     @PutMapping
diff --git a/eladmin-generator/src/main/resources/template/admin/Service.ftl b/eladmin-generator/src/main/resources/template/admin/Service.ftl
index ef337149..9329e8b5 100644
--- a/eladmin-generator/src/main/resources/template/admin/Service.ftl
+++ b/eladmin-generator/src/main/resources/template/admin/Service.ftl
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
+import me.zhengjie.utils.PageResult;
 
 /**
 * @website https://eladmin.vip
@@ -38,7 +39,7 @@ public interface ${className}Service {
     * @param pageable 分页参数
     * @return Map<String,Object>
     */
-    Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable);
+    PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable);
 
     /**
     * 查询所有数据不分页
@@ -57,9 +58,8 @@ public interface ${className}Service {
     /**
     * 创建
     * @param resources /
-    * @return ${className}Dto
     */
-    ${className}Dto create(${className} resources);
+    void create(${className} resources);
 
     /**
     * 编辑
diff --git a/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl b/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
index 4f1f07da..e79205c2 100644
--- a/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
+++ b/eladmin-generator/src/main/resources/template/admin/ServiceImpl.ftl
@@ -52,6 +52,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import me.zhengjie.utils.PageResult;
 
 /**
 * @website https://eladmin.vip
@@ -67,7 +68,7 @@ public class ${className}ServiceImpl implements ${className}Service {
     private final ${className}Mapper ${changeClassName}Mapper;
 
     @Override
-    public Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable){
+    public PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable){
         Page<${className}> page = ${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
         return PageUtil.toPage(page.map(${changeClassName}Mapper::toDto));
     }
@@ -87,7 +88,7 @@ public class ${className}ServiceImpl implements ${className}Service {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ${className}Dto create(${className} resources) {
+    public void create(${className} resources) {
 <#if !auto && pkColumnType = 'Long'>
         Snowflake snowflake = IdUtil.createSnowflake(1, 1);
         resources.set${pkCapitalColName}(snowflake.nextId()); 
@@ -104,7 +105,7 @@ public class ${className}ServiceImpl implements ${className}Service {
     </#if>
     </#list>
 </#if>
-        return ${changeClassName}Mapper.toDto(${changeClassName}Repository.save(resources));
+        ${changeClassName}Repository.save(resources);
     }
 
     @Override