解决冲突

2026-01-30 18:09:31 +08:00
parent 109ae688d2
commit e461791a0e
4 changed files with 173 additions and 6 deletions
--- a/pkg/config/defaults/config.yaml
+++ b/pkg/config/defaults/config.yaml
@@ -105,14 +105,13 @@ default_admin:
  password: ""
  phone: ""

-<<<<<<< HEAD
 # Gateway 服务配置
 gateway:
  base_url: "https://lplan.whjhft.com/openapi"
  app_id: "60bgt1X8i7AvXqkd"
  app_secret: "BZeQttaZQt0i73moF"
  timeout: 30
-=======
+
 # 微信配置（必填项需通过环境变量设置）
 wechat:
  official_account:
@@ -132,4 +131,3 @@ wechat:
    notify_url: ""            # 必填：JUNHONG_WECHAT_PAYMENT_NOTIFY_URL
    http_debug: false
    timeout: "30s"
->>>>>>> emdash/wechat-official-account-payment-integration-30g