From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/web/init/InitResource.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/init/InitResource.java b/src/main/java/com/mzl/flower/web/init/InitResource.java
index 75ff2dd..256b725 100644
--- a/src/main/java/com/mzl/flower/web/init/InitResource.java
+++ b/src/main/java/com/mzl/flower/web/init/InitResource.java
@@ -36,7 +36,7 @@
         return returnData(R.SUCCESS.getCode(), null);
     }
 
-    @GetMapping("/callback")
+    /*@GetMapping("/callback")
     public ResponseEntity<ReturnDataDTO> callback(String orderId) {
         String originalXml = "";
         UserPaymentDTO dto = new UserPaymentDTO();
@@ -50,5 +50,5 @@
         userPaymentV3Service.saveCallbackInfo(dto, Constants.ORDER_STATUS_BACKEND.PAYMENT.name());
 
         return returnData(R.SUCCESS.getCode(), null);
-    }
+    }*/
 }

--
Gitblit v1.9.3