Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/farmplant/controller/FarmProductStockController.java

@@ -65,6 +65,15 @@
      return R.data(pages);
   }


   @GetMapping("/strainCount")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入farmProductStock")
   public R<IPage<FarmProductStockVO>> strainCount(FarmProductStockVO farmProductStock, Query query) {
      IPage<FarmProductStockVO> pages = farmProductStockService.selectFarmProductStockPagesCount(Condition.getPage(query), farmProductStock);
      return R.data(pages);
   }

   /**
    * 自定义分页
    */
@@ -236,4 +245,10 @@
      return R.data(cssum);
   }

   @GetMapping("/getByLandId")
   public R getByLandId(String strainId,String landId){
      FarmProductStock farmProductStock = farmProductStockService.selectBy2Id(strainId,landId);
      return R.data(farmProductStock);
   }

}