From dd67f7b963a087b6b90ae0c1e0eb61c37d94f510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Thu, 17 Aug 2023 11:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pluss/platform/controller/MerchantOrderController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
index f084ed2..41e8391 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
@@ -1124,9 +1124,9 @@ public class MerchantOrderController {
     public Result<Object> returnOrderV4(@RequestParam String orderNumber,@RequestParam  BigDecimal amount,@RequestParam  String noticeCode,
                                         @RequestParam String mercRefundNo,
                                         @RequestParam String notifyUrl,
-                                        @RequestParam String refundReason,
-                                        @RequestParam String payPassword){
-        JSONObject object= merchantOrderService.apiReturnOrderV4(orderNumber,amount,mercRefundNo,notifyUrl,noticeCode, payPassword,"app" );
+                                        @RequestParam String refundReason
+                                        ){
+        JSONObject object= merchantOrderService.apiReturnOrderV4(orderNumber,amount,mercRefundNo,notifyUrl,noticeCode, null,"app" );
         return ResultGenerator.genSuccessResult("退款成功",object);
     }
     /**