From 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Sep 2020 03:23:52 +0800
Subject: [PATCH] fix conflicts
---
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 9294a72..74dac92 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
@@ -22,9 +22,11 @@
public void updateOrderIsCanClosingAndBatchNoById(Long id);
- public Result findHoldOrderList(String symbol);
+ public Result findHoldOrderList(String symbol, int type);
public Result cancelHoldOrder(Long id);
+
+ public Result cancelHoldOrder(WholeCloseOrderDto wholeCloseOrderDto);
public Result cancelHoldOrderBatch(SymbolDto symbolDto);
@@ -42,4 +44,12 @@
public Result findOrderDetailById(Long id);
+ public void calHoldOrderHoldFeeAmount();
+
+<<<<<<< HEAD
+ public Result changePositionType();
+=======
+ public void calHoldFeeAmountForBondAmount();
+>>>>>>> master
+
}
--
Gitblit v1.9.1