Merge remote-tracking branch 'origin/master'

zengh

2022-07-15 a57a39de178fcc2bda213e7791d61d2570c4831e

 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java

@@ -47,8 +47,8 @@
   }

   @Override
   public List<Map<Object, String>> countTaskNum(String year) {
      return baseMapper.countTaskNum(year);
   public List<Map<Object, String>> countTaskNum(TaskVO task) {
      return baseMapper.countTaskNum(task);
   }