精准饲喂母猪修改2

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/param/FeedingFatPageParam.java

@@ -28,13 +28,29 @@ import java.util.Date;
 @Setter
 public class FeedingFatPageParam {
 
+
+//
+//
+//    /** 排序字段 */
+//    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
+//    private String sortField;
+//
+//    /** 排序方式 */
+//    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
+//    private String sortOrder;
+//
+//    /** 关键词 */
+//    @ApiModelProperty(value = "关键词")
+//    private String searchKey;
+
+
     /** 当前页 */
     @ApiModelProperty(value = "当前页码")
-    private Integer pageNum;
+    private Integer current;
 
     /** 每页条数 */
     @ApiModelProperty(value = "每页条数")
-    private Integer pageSize;
+    private Integer size;
 
     /** 排序方式 */
     @ApiModelProperty(value = "组织id")

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -101,8 +101,8 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
     @Override
     public IPage<FeedingFatVo> fatPage(FeedingFatPageParam feedingFatPageParam) {
         String orgId =feedingFatPageParam.getOrgId();
-        Integer pageNum = feedingFatPageParam.getPageNum();
-        Integer pageSize = feedingFatPageParam.getPageSize();
+        Integer pageNum = feedingFatPageParam.getCurrent();
+        Integer pageSize = feedingFatPageParam.getSize();
         String eartagNum = feedingFatPageParam.getEartagNum();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId).eq(StringUtils.isNotBlank(eartagNum), "eartag_num", eartagNum);