From db6223864d9d35ee0f09835cbdb2d3c3c4e386d3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 14:08:23 +0800
Subject: [PATCH] 20210325 消息提醒
---
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