a

2026-01-18 10:05:02 +08:00 · 2026-01-18 10:05:02 +08:00 · 81e76a57b5
commit 81e76a57b5
parent 79f7d0edc8
1 changed files with 0 additions and 3 deletions
--- a/trading_system/position_manager.py
+++ b/trading_system/position_manager.py
@ -114,10 +114,7 @@ class PositionManager:
                logger.warning(f"   3. 总仓位超过限制")
                logger.warning(f"   4. 无法获取价格数据")
                logger.warning(f"   5. 保证金不足最小要求（MIN_MARGIN_USDT）")
-<<<<<<< Current (Your changes)
-=======
                logger.warning(f"   6. 名义价值小于0.2 USDT（避免无意义的小单子）")
->>>>>>> Incoming (Background Agent changes)
                return None
            
            logger.info(f"✓ {symbol} 仓位计算成功: {quantity:.4f}")