Merge remote-tracking branch 'origin/master'

zengh

2022-07-09 d48d6e9bb0bb48f8338798d8a2cba60396e16698

 src/main/java/org/springblade/modules/task/controller/TaskController.java

@@ -152,4 +152,12 @@
      map.put("num",i);
      return R.data(map);
   }

   /**
    * 统计任务总数
    */
   @GetMapping("/countTaskNum")
   public R countTaskNum(String year) {
      return R.data(taskService.countTaskNum(year));
   }
}