Merge remote-tracking branch 'origin/master'

guoshilong

2022-08-26 17cfbc75dc326f3e5963ee17c99d6516497f8cf1

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

@@ -157,7 +157,7 @@
    * 统计任务总数
    */
   @GetMapping("/countTaskNum")
   public R countTaskNum(String year) {
      return R.data(taskService.countTaskNum(year));
   public R countTaskNum(TaskVO task) {
      return R.data(taskService.countTaskNum(task));
   }
}