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/farm/mapper/FarmingRecordMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
index da82f42..af9e106 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -41,7 +41,7 @@
             and sfr.strain_id = #{farmingRecord.strainId}
         </if>
         <if test="farmingRecord.farmId!=null and farmingRecord.farmId!=''">
-            and sl.farm_id = #{farm.farmId}
+            and sl.farm_id = #{farmingRecord.farmId}
         </if>
     </select>
 

--
Gitblit v1.9.3