fix(app):

1.全局替换分页参数为pageNo

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/form/PageOrdersForm.java

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.system.app.dto.BasePageDTO;
+import org.jeecg.modules.app.dto.PageDTO;
 
 import java.io.Serializable;
 
@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @Schema(description = "我的订单分页表单对象")
-public class PageOrdersForm extends BasePageDTO implements Serializable {
+public class PageOrdersForm extends PageDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "订单状态：0-待付款 1-待使用 2-已使用 3-已到期 4-已取消 5-退款中 6已退款")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -1547,7 +1547,7 @@ public class OrderServiceImpl implements IOrderService {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         pageOrdersForm.setUserId(loginUser.getId());
 
-        Page<PageOrdersVO> page = new Page<>(pageOrdersForm.getPageNum(), pageOrdersForm.getPageSize());
+        Page<PageOrdersVO> page = new Page<>(pageOrdersForm.getPageNo(), pageOrdersForm.getPageSize());
 
         IPage<PageOrdersVO> pageOrders = appOrderMapper.pageOrders(page, pageOrdersForm);
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCategoryDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -19,7 +20,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="运动类目入参DTO")
-public class AppCategoryDTO extends BasePageDTO{
+public class AppCategoryDTO extends PageDTO {
     @Schema(description ="id")
     private String id;
     @Schema(description ="名称")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesPageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="课程课时入参DTO")
-public class AppCoursesPageDTO extends BasePageDTO {
+public class AppCoursesPageDTO extends PageDTO {
 
     @Schema(description = "orgCode")
     private String orgCode;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGamePageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description = "赛事-赛程-赛价分页入参DTO")
-public class AppGamePageDTO extends BasePageDTO{
+public class AppGamePageDTO extends PageDTO {
     @Schema(description = "名称")
     private String name;
     @Schema(description = "比赛项目")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSitePageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="场地分页入参DTO")
-public class AppSitePageDTO extends BasePageDTO{
+public class AppSitePageDTO extends PageDTO {
     @Schema(description = "名称")
     private String name;
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSitePlacePageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="场所分页入参自定义DTO")
-public class AppSitePlacePageDTO extends BasePageDTO{
+public class AppSitePlacePageDTO extends PageDTO {
     @Schema(description = "商户门店id")
     private String siteId ;
     @Schema(description = "名称")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSitePlaceUnfixedPageDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.app.dto.PageDTO;
 
 /**
  * @author DM
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description = "无固定场分页入参DTO")
-public class AppSitePlaceUnfixedPageDTO extends BasePageDTO{
+public class AppSitePlaceUnfixedPageDTO extends PageDTO {
     @Schema(description = "名称")
     private String name;
     @Schema(description = "场所id")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/BasePageDTO.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.system.app.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * @author DM
- * @date 2025/7/7 16:17
- * @description
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description="分页入参DTO")
-public class BasePageDTO {
-    @Schema(description = "当前页码", required = true)
-    private Long pageNum = 1L;
-
-    @Schema(description = "每页条数", required = true)
-    private Long pageSize = 10L;
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/form/AppOrderPageForm.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import org.jeecg.modules.system.app.dto.BasePageDTO;
+import org.jeecg.modules.app.dto.PageDTO;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -19,7 +19,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description="订单分页表单对象")
-public class AppOrderPageForm extends BasePageDTO implements Serializable {
+public class AppOrderPageForm extends PageDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "手机号码")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppCategoryServiceImpl.java

@@ -77,7 +77,7 @@ public class AppCategoryServiceImpl extends ServiceImpl<AppCategoryMapper, AppCa
 
     @Override
     public IPage<AppCategoryVO> queryCategoryList(AppCategoryDTO dto) {
-        Page<AppCategory> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppCategory> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         LambdaQueryWrapper<AppCategory> wrapper = Wrappers.<AppCategory>lambdaQuery()
                 .like(StringUtils.isNotBlank(dto.getName()), AppCategory::getName, dto.getName()).last("order by sort");
         IPage<AppCategory> resultPage = baseMapper.selectPage(page, wrapper);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppCoureseServiceImpl.java

@@ -248,7 +248,7 @@ public class AppCoureseServiceImpl extends ServiceImpl<AppCoursesMapper, AppCour
     public IPage<AppCoursesInfoPageDTO> queryWitchPriceRulesPage(AppCoursesPageDTO dto) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         dto.setOrgCode(loginUser.getOrgCode());
-        Page<AppCourses> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppCourses> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         IPage<AppCoursesInfoPageDTO> resultPage = baseMapper.queryWitchPriceRulesPage(page, dto);
 
         resultPage.getRecords().forEach(r -> {
@@ -343,8 +343,7 @@ public class AppCoureseServiceImpl extends ServiceImpl<AppCoursesMapper, AppCour
     /**
      * 临时约课
      *
-     * @param coursePriceRulesId
-     * @param familyMemberId
+     * @param temporaryCourseForm
      * @return
      */
     @Override

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppGameServiceImpl.java

@@ -224,7 +224,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
     @Override
     public IPage<AppGameDTO> queryWitchPriceRulesPage(AppGamePageDTO dto) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        Page<AppGame> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppGame> page = new Page<>(dto.getPageNo(), dto.getPageSize());
 //        LambdaQueryWrapper<AppGame> wrapper = Wrappers.<AppGame>lambdaQuery()
 //                .like(StringUtils.isNotBlank(dto.getName()), AppGame::getName, dto.getName());
 //                .eq(AppGame::getOrgCode, loginUser.getOrgCode());

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -109,7 +109,7 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
 
     @Override
     public Page<OrderPageVO> queryPage(AppOrderPageForm appOrderPageForm) {
-        Page<OrderPageVO> page = new Page<>(appOrderPageForm.getPageNum(), appOrderPageForm.getPageSize());
+        Page<OrderPageVO> page = new Page<>(appOrderPageForm.getPageNo(), appOrderPageForm.getPageSize());
 
         Page<OrderPageVO> voPage = baseMapper.queryPage(page, appOrderPageForm);
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -216,7 +216,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
     public IPage<AppSitePlaceCuDTO> querySchoolPage(AppSitePlacePageDTO dto) {
         if (null == dto.getType()) throw new JeecgBootException("请选择类型", SC_INTERNAL_SERVER_ERROR_500);
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        Page<AppSitePlace> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppSitePlace> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         LambdaQueryWrapper<AppSitePlace> wrapper = Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getType, dto.getType())
                 .like(StringUtils.isNotBlank(dto.getName()), AppSitePlace::getName, dto.getName())
                 .eq(AppSitePlace::getOrgCode, loginUser.getOrgCode());
@@ -330,7 +330,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
     @Override
     public IPage<AppSitePlaceUnfixedDTO> queryUnfixedPage(AppSitePlaceUnfixedPageDTO dto) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        Page<AppSitePlace> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppSitePlace> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         LambdaQueryWrapper<AppSitePlace> wrapper = Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
 //                .eq(AppSitePlace::getSiteId, dto.getSiteId())
                 .likeRight(AppSitePlace::getOrgCode, loginUser.getOrgCode())

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSiteServiceImpl.java

@@ -124,7 +124,7 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
 
     @Override
     public IPage<AppSiteDTO> querySitePage(AppSitePageDTO dto) {
-        Page<AppSite> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        Page<AppSite> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         LambdaQueryWrapper<AppSite> wrapper = Wrappers.<AppSite>lambdaQuery()
                 .like(StringUtils.isNotBlank(dto.getName()), AppSite::getName, dto.getName());
         IPage<AppSite> resultPage = baseMapper.selectPage(page, wrapper);