From 5ac328adc442d47b6039ed924e6de1162c90cbe0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 十一月 2025 21:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/IOrderCallService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/IOrderCallService.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/IOrderCallService.java
index 1530c12..faf4744 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/IOrderCallService.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/call/server/IOrderCallService.java
@@ -25,5 +25,5 @@
      * @param order_id
      * @throws Exception
      */
-    void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+    void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType,String out_trade_no) throws Exception;
 }

--
Gitblit v1.7.1