From e3d9c8f3b74052c222968bab8885ee0eee537207 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Fri, 09 Jan 2026 21:53:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jwj84' into jwj84

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/contract/ContractOrderController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/contract/ContractOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/contract/ContractOrderController.java
index f4a8975..1f29622 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/contract/ContractOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/contract/ContractOrderController.java
@@ -124,7 +124,7 @@
                 while (true) {
 
                     if (this.contractOrderService.lock(order_no)) {
-                        this.contractOrderService.saveClose(partyId, order_no);
+                        this.contractOrderService.saveClose(partyId, order_no,null);
                         // 处理完退出
                         break;
                     }

--
Gitblit v1.9.3