Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

 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();
   }