fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java

@@ -42,4 +42,6 @@

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

}