Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 136750119bcab23b45f1b3a12838943a02e5f536

 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>