From daa6dce26ec80c58a0013b73c44a409a96f4cfc7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
index 7082f4f..20e2034 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmingRecordService.java
@@ -31,13 +31,13 @@
 	 * 查询统计本年农事记录操作总数
 	 * @return
 	 */
-	Object getFarmingCount(String deptId);
+	Object getFarmingCount(String farmId);
 
 	/**
 	 * 查询统计本年农事记录操作,按分类统计
 	 * @return
 	 */
-    Object getFarmingStatis(String deptId);
+    Object getFarmingStatis(String farmId);
 	//今年农资使用量
 	Double selectJyCount(String deptId);
 	//去年农资使用量

--
Gitblit v1.9.3