From 61af631e4654e84c6cff4a81611dd205452b8d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=87=E8=96=87=E5=AE=89?= <vivian@192.168.3.101>
Date: Sun, 18 Jan 2026 09:38:27 +0800
Subject: [PATCH] a

---
 trading_system/config.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/trading_system/config.py b/trading_system/config.py
index c9805d6..11e4c13 100644
--- a/trading_system/config.py
+++ b/trading_system/config.py
@@ -165,16 +165,10 @@ def _get_config_value(key, default=None):
     return default
 
 def _get_trading_config():
-<<<<<<< Current (Your changes)
-    """获取交易配置（支持动态重载）"""
-    if _config_manager:
-        _config_manager.reload()  # 每次获取配置时重新加载
-=======
     """获取交易配置（支持动态重载，优先从Redis读取最新值）"""
     if _config_manager:
         # 从Redis重新加载配置（轻量级，只从Redis读取，不查数据库）
         _config_manager.reload_from_redis()
->>>>>>> Incoming (Background Agent changes)
         return _config_manager.get_trading_config()
     # 回退到默认配置
     return {