From 4d33da83dcc57e0347e503958d0ad30a59f42ac9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Mar 2021 18:15:30 +0800
Subject: [PATCH] 20210302 我的跟单--我的跟单--历史跟单

---
 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