Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/farmplant/service/FarmProductStockService.java

@@ -25,6 +25,7 @@
    * @return
    */
   IPage<FarmProductStockVO> selectFarmProductStockPage(IPage<FarmProductStockVO> page, FarmProductStockVO farmProductStock);
   IPage<FarmProductStockVO> selectFarmProductStockPagesCount(IPage<Object> page, FarmProductStockVO farmProductStock);
   List<FarmProductStockVO> selectFarmProductStockPages(FarmProductStockVO farmProductStock);

   List<FarmProductStock> findFarmProductStockByFarmIdAndStrainId(String farmId, Integer strainId);