diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java
index aceff116..85e9162a 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemDeptController.java
@@ -43,7 +43,7 @@ public class SystemDeptController {
      */
     @GetMapping("/list")
     public Object list(@RequestParam Map<String, String> params) {
-        JSONArray list = iSystemDeptService.lists(params);
+        JSONArray list = iSystemDeptService.list(params);
         return AjaxResult.success(list);
     }
 
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java
index a391c671..f0291401 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/ISystemDeptService.java
@@ -27,7 +27,7 @@ public interface ISystemDeptService {
      * @param params 搜索参数
      * @return JSONArray
      */
-    JSONArray lists(Map<String, String> params);
+    JSONArray list(Map<String, String> params);
 
     /**
      * 部门详情
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java
index 7d1c9029..c3acf31f 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java
@@ -73,7 +73,7 @@ public class AlbumServiceImpl implements IAlbumService {
 
         IPage<Album> iPage = albumMapper.selectPage(new Page<>(page, limit), queryWrapper);
 
-        List<AlbumVo> albumVoArrayList = new ArrayList<>();
+        List<AlbumVo> list = new ArrayList<>();
         for (Album album : iPage.getRecords()) {
             AlbumVo vo = new AlbumVo();
             BeanUtils.copyProperties(album, vo);
@@ -82,10 +82,10 @@ public class AlbumServiceImpl implements IAlbumService {
             vo.setSize(ToolsUtil.storageUnit(album.getSize()));
             vo.setCreateTime(TimeUtil.timestampToDate(album.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(album.getUpdateTime()));
-            albumVoArrayList.add(vo);
+            list.add(vo);
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), albumVoArrayList);
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
     }
 
     /**
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java
index 9110a6c2..f95d9022 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java
@@ -76,7 +76,7 @@ public class ArticleServiceImpl implements IArticleService {
             vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime()));
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords());
+        return PageResult.iPageHandle(iPage);
     }
 
     /**
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
index 3205e435..11071690 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java
@@ -107,7 +107,7 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
             vo.setLastLoginTime(TimeUtil.timestampToDate(vo.getLastLoginTime()));
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords());
+        return PageResult.iPageHandle(iPage);
     }
 
     /**
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java
index 41fe990d..f4c1ced7 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemDeptServiceImpl.java
@@ -64,7 +64,7 @@ public class SystemDeptServiceImpl implements ISystemDeptService {
      * @return JSONArray
      */
     @Override
-    public JSONArray lists(Map<String, String> params) {
+    public JSONArray list(Map<String, String> params) {
         QueryWrapper<SystemDept> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_delete", 0);
         queryWrapper.orderByAsc(Arrays.asList("sort", "id"));
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java
index ca575306..e4fc3a3d 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java
@@ -77,7 +77,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
             vo.setError(StringUtil.isNull(vo.getError()) ? "" : vo.getError());
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords());
+        return PageResult.iPageHandle(iPage);
     }
 
     /**
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java
index 4a8494f9..b9770414 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemPostService.java
@@ -85,17 +85,17 @@ public class SystemPostService implements ISystemPostService {
 
         IPage<SystemPost> iPage = systemPostMapper.selectPage(new Page<>(page, limit), queryWrapper);
 
-        List<SystemPostVo> adminVoArrayList = new ArrayList<>();
+        List<SystemPostVo> list = new ArrayList<>();
         for (SystemPost systemPost : iPage.getRecords()) {
             SystemPostVo vo = new SystemPostVo();
             BeanUtils.copyProperties(systemPost, vo);
 
             vo.setCreateTime(TimeUtil.timestampToDate(systemPost.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(systemPost.getUpdateTime()));
-            adminVoArrayList.add(vo);
+            list.add(vo);
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), adminVoArrayList);
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
     }
 
     /**
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java
index 85d4c23d..08e981a3 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java
@@ -59,7 +59,7 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
 
         IPage<SystemRole> iPage = systemRoleMapper.selectPage(new Page<>(page, limit), queryWrapper);
 
-        List<SystemRoleVo> roleVoArrayList = new ArrayList<>();
+        List<SystemRoleVo> list = new ArrayList<>();
         for (SystemRole systemRole : iPage.getRecords()) {
             SystemRoleVo vo = new SystemRoleVo();
             BeanUtils.copyProperties(systemRole, vo);
@@ -72,10 +72,10 @@ public class SystemRoleServiceImpl implements ISystemRoleService {
             vo.setMember(member);
             vo.setCreateTime(TimeUtil.timestampToDate(systemRole.getCreateTime()));
             vo.setUpdateTime(TimeUtil.timestampToDate(systemRole.getUpdateTime()));
-            roleVoArrayList.add(vo);
+            list.add(vo);
         }
 
-        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), roleVoArrayList);
+        return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list);
     }
 
     /**
diff --git a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
index a8d92d8d..5b08dbd7 100644
--- a/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
+++ b/server/like-common/src/main/java/com/hxkj/common/core/PageResult.java
@@ -55,12 +55,12 @@ public class PageResult<T> {
      * @param <T> 实体类型
      * @return PageList
      */
-    public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> lists) {
+    public static <T> PageResult<T> iPageHandle(Long total, Long pageNo, Long size, List<T> list) {
         PageResult<T> pageResult = new PageResult<>();
         pageResult.setCount(total);
         pageResult.setPageNo(Math.toIntExact(pageNo));
         pageResult.setPageSize(Math.toIntExact(size));
-        pageResult.setLists(lists);
+        pageResult.setLists(list);
 
         return pageResult;
     }