conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

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

    public Result findOrderDetailById(Long id);

    public void calHoldOrderHoldFeeAmount();

}