WEB：分页查询设备列表

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<Device> queryDevice(DeviceQueryCriteria criteria) throws IOException {
-        Page<Device> page = new Page<>(criteria.getPage(), criteria.getSize());
+        Page<Device> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
         return deviceService.queryAll(criteria, page);
     }
 

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<DeviceType> queryDeviceType(DeviceTypeQueryCriteria criteria) {
-        Page<DeviceType> page = new Page<>(criteria.getPage(), criteria.getSize());
+        Page<DeviceType> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
         return deviceTypeService.queryAll(criteria, page);
     }
 

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;

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;
 }