Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -29,7 +29,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/workflow/task/")
-@Api(tags = "计划管理")
+@Api(tags = "任务管理")
 public class PlanManageController {
 
     @Autowired
@@ -271,9 +271,9 @@ public class PlanManageController {
     @GetMapping("/plan/delProcInst")
     @ApiOperation(value = "终止流程")
     public AjaxMessage deleteProcessInstance(
-            @ApiParam(value = "任务ID", required = true) @RequestBody Integer id,
-            @ApiParam(value = "流程ID", required = true) @RequestBody String processInstanceId,
-                                             @ApiParam(value = "流程备注", required = true) @RequestBody String remark) {
+            @ApiParam(value = "任务ID", required = true) @RequestParam(required = true) Integer id,
+            @ApiParam(value = "流程ID", required = true) @RequestParam(required = true) String processInstanceId,
+            @ApiParam(value = "流程备注", required = false) @RequestParam(required = false) String remark) {
         Boolean delFlow = workFlowService.deleteProcessInstance(processInstanceId,remark);
         if(delFlow ==true) {
             PlanManage planManage = new PlanManage();