From e7599b419fcb22f19e074c9f58e3ed3a96840c5d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 05 Mar 2021 10:19:10 +0800
Subject: [PATCH] 20210304 跟单只允许跟一个交易员
---
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
index 74dac92..bbcbbd8 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
@@ -46,10 +46,7 @@
public void calHoldOrderHoldFeeAmount();
-<<<<<<< HEAD
public Result changePositionType();
-=======
public void calHoldFeeAmountForBondAmount();
->>>>>>> master
}
--
Gitblit v1.9.1