diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java index 8308068..e6405d8 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java @@ -62,7 +62,7 @@ public class DeviceController { @Operation(summary = "分页查询设备列表", security = {@SecurityRequirement(name = "bearer-key")}) @GetMapping public TableDataInfo queryDevice(DeviceQueryCriteria criteria) throws IOException { - Page page = new Page<>(criteria.getPage(), criteria.getSize()); + Page page = new Page<>(criteria.getPageNum(), criteria.getPageSize()); return deviceService.queryAll(criteria, page); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java index 100a44c..3e5d8be 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java @@ -33,7 +33,7 @@ public class DeviceTypeController { @GetMapping @Operation(summary = "分页查询设备类型") public TableDataInfo queryDeviceType(DeviceTypeQueryCriteria criteria) { - Page page = new Page<>(criteria.getPage(), criteria.getSize()); + Page page = new Page<>(criteria.getPageNum(), criteria.getPageSize()); return deviceTypeService.queryAll(criteria, page); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java index 773a18b..e8efd86 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java @@ -45,10 +45,10 @@ public class DeviceQueryCriteria extends BaseEntity { private Integer deviceStatus; @Schema(name = "页码", example = "1") - private Integer page = 1; + private Integer pageNum = 1; @Schema(name = "每页数据量", example = "10") - private Integer size = 10; + private Integer pageSize = 10; @Schema(name = "客户id") private Long customerId; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java index 9d2010e..a2a0ad0 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java @@ -31,9 +31,8 @@ public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable private Long tenantId; @Schema(name = "页码", example = "1") - private Integer page = 1; + private Integer pageNum = 1; @Schema(name = "每页数据量", example = "10") - private Integer size = 10; - + private Integer pageSize = 10; }