解决冲突

2026-01-30 17:37:35 +08:00
parent 65b4127b84
commit 109ae688d2
9 changed files with 3 additions and 4751 deletions
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -23,11 +23,8 @@ type Config struct {
 	JWT          JWTConfig          `mapstructure:"jwt"`
 	DefaultAdmin DefaultAdminConfig `mapstructure:"default_admin"`
 	Storage      StorageConfig      `mapstructure:"storage"`
-<<<<<<< HEAD
 	Gateway      GatewayConfig      `mapstructure:"gateway"`
-=======
 	Wechat       WechatConfig       `mapstructure:"wechat"`
->>>>>>> emdash/wechat-official-account-payment-integration-30g
 }

 // ServerConfig HTTP 服务器配置