Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java

src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java

@@ -77,4 +77,14 @@ public class TaskController {
         taskService.modifyTask(token,task);
         return ResponseMap.ofSuccess("操作成功");
     }
+    @SneakyThrows
+    @DeleteMapping
+    public ResponseMap deleteTaskAndSubTask(
+            @RequestHeader("Token") String token,
+            @PathVariable("projectId") Integer projectId,
+            @RequestParam("taskId") Long taskId
+    ) {
+        return ResponseMap.ofSuccess("删除成功");
+    }
+
 }