适配

fw-sample-admin/src/main/java/com/mokasz/sample/admin/controller/AdminLogController.java

@@ -32,6 +32,6 @@ public class AdminLogController {
         pageWrapper.ge(query.getStartTime() != null, AdminLogENT::getCreateTime, query.getStartTime());
         pageWrapper.ge(query.getEndTime() != null, AdminLogENT::getCreateTime, query.getEndTime());
         pageWrapper.orderByDesc(AdminLogENT::getId);
-        return adminLogService.page(new Page<>(query.getPageIndex(), query.getPageSize()), pageWrapper);
+        return adminLogService.page(new Page<>(query.getPageNum(), query.getPageSize()), pageWrapper);
     }
 }

fw-sample-admin/src/main/java/com/mokasz/sample/admin/controller/DictController.java

@@ -35,7 +35,7 @@ public class DictController {
         LambdaQueryWrapper<DictENT> pageWrapper = Wrappers.lambdaQuery();
         pageWrapper.eq(StringUtils.isNotBlank(query.getGroupCode()), DictENT::getGroupCode, query.getGroupCode());
         pageWrapper.eq(StringUtils.isNotBlank(query.getKeyCode()), DictENT::getKeyCode, query.getKeyCode());
-        return dictService.page(new Page<>(query.getPageIndex(), query.getPageSize()), pageWrapper);
+        return dictService.page(new Page<>(query.getPageNum(), query.getPageSize()), pageWrapper);
     }
 
     @GetMapping("queryByGroup")

fw-sample-service/src/main/java/com/mokasz/sample/common/model/BasePageQuery.java

@@ -9,12 +9,12 @@ import lombok.Data;
 public abstract class BasePageQuery {
 
     @ApiModelProperty("起始页（从1开始）")
-    protected Integer pageIndex = 1;
+    protected Integer pageNum = 1;
 
     @ApiModelProperty("每页大小")
     protected Integer pageSize = 10;
 
     public Integer getStart() {
-        return (pageIndex - 1) * pageSize;
+        return (pageNum - 1) * pageSize;
     }
 }