From 136750119bcab23b45f1b3a12838943a02e5f536 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 18 Mar 2021 10:43:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
index 5fea101..714cc73 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -42,6 +42,9 @@
<if test="animalHeatVo.type==2">
and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
</if>
+ <if test="animalHeatVo.status!=null">
+ and status=#{animalHeatVo.status}
+ </if>
ORDER BY create_time asc
</select>
--
Gitblit v1.9.3