a

2026-01-18 10:09:23 +08:00 · 2026-01-18 10:09:23 +08:00 · 4a84f5e6ad
commit 4a84f5e6ad
parent ed8b2cf473
1 changed files with 0 additions and 7 deletions
--- a/trading_system/position_manager.py
+++ b/trading_system/position_manager.py
@ -410,14 +410,7 @@ class PositionManager:
                        # 如果数据库已保存，标记为取消
                        if trade_id and DB_AVAILABLE and Trade:
                            try:
-<<<<<<< Current (Your changes)
-<<<<<<< Current (Your changes)
-=======
                                from database.connection import db
->>>>>>> Incoming (Background Agent changes)
-=======
-                                from database.connection import db
->>>>>>> Incoming (Background Agent changes)
                                db.execute_update(
                                    "UPDATE trades SET status = 'cancelled' WHERE id = %s",
                                    (trade_id,)