From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
index 264f617..ed4bb79 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/FarmPlantService.java
@@ -26,6 +26,7 @@
 	 * @return
 	 */
 	IPage<FarmPlantVO> selectFarmPlantPage(IPage<FarmPlantVO> page, FarmPlantVO farm);
+	IPage<FarmPlantVO> getFarmPlantStatisticsCountz(IPage<FarmPlantVO> page, FarmPlantVO farm);
 
 	/**
 	 * 农产品种养统计
@@ -58,4 +59,11 @@
 	Map selectProductr(String code, String time);
 	Map selectProducts(String code, String time);
 	Map selectProductf(String code, String time);
+
+	/**
+	 * 查询种养记录列表（不分页）
+	 * @param farmPlant
+	 * @return
+	 */
+    List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant);
 }

--
Gitblit v1.9.3