Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml

@@ -45,7 +45,7 @@
        <if test="animalHeatVo.status!=null">
            and status=#{animalHeatVo.status}
        </if>
        ORDER BY create_time asc
        ORDER BY create_time desc
    </select>

    <!--查询本周每天的体温数据(按礼拜一开始计算)-->