Merge remote-tracking branch 'origin/master'

zengh

2021-03-20 9d4e322f4d4d8c1b941185c7c95d6df08937aff1

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/service/impl/AnimalHeatServiceImpl.java

@@ -132,7 +132,6 @@
    */
   @Override
   public List<Map<String, Integer>> selWeekDayAnimalStatis() {
      List<Map<String,Integer>> selWeekDayAnimalStatis;
      return baseMapper.selWeekDayAnimalStatis();
   }