From 4a84f5e6add01366873060cea79bfadef3947d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=87=E8=96=87=E5=AE=89?= Date: Sun, 18 Jan 2026 10:09:23 +0800 Subject: [PATCH] a --- trading_system/position_manager.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/trading_system/position_manager.py b/trading_system/position_manager.py index 21ecae2..8b9b4bd 100644 --- 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,)