Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/resources/generator-mapper/generatorConfig.xml
2024-05-17 10:31:29 +08:00
parent 1c6ccb7d10 bdce57ca44
commit 168d9c8a43
22 changed files with 1281 additions and 63 deletions
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,4 +38,10 @@ gateway:
  url: https://gateway.api.sxczgkj.cn/gate-service/
 client:
  backUrl: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay
+thirdPay:
+  payType: ysk
+  callBack: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay
+  url: https://paymentapi.sxczgkj.cn
+
+