Merge remote-tracking branch 'origin/master'

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmPurchaseExecutionController.java

@@ -562,16 +562,12 @@ public class PmPurchaseExecutionController extends BaseController {
     }
 
     @ApiOperation(value = "流废标退回",notes = "采购需求ID必传")
-    @PostMapping("/returnBidFailure")
+    @GetMapping("/returnBidFailure")
     @PreAuthorize("@ss.hasPermi('pm:purchaseExecution:returnBidFailure')")
     @Log(title = ModularConstans.purchaseExecution, businessType = BusinessType.UPDATE)
-    public AjaxResult returnBidFailure(@NotEmpty(message = "数据为空")
-                                         @RequestBody PmCallQuestionReqVo pmCallQuestionReqVo) {
+    public AjaxResult returnBidFailure(@NotEmpty(message = "采购需求id不能为空")
+                                           @RequestParam(value = "demandId", required = true) Long demandId) {
         try {
-            Long demandId = pmCallQuestionReqVo.getDemandId();
-            if(ObjectUtils.isEmpty(demandId)){
-                return error("参数错误");
-            }
             PmDemand pmDemand = pmDemandService.getById(demandId);
             if(ObjectUtils.isEmpty(pmDemand)){
                 return error("参数错误");