From 9c9c8f1e9b4658f65997c66769507c6ea6476a7f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 28 Jan 2021 16:54:38 +0800 Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new --- 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