fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/test/java/com/xcong/excoin/SymbolsTest.java

@@ -134,7 +134,7 @@
    @Test
    public void holdAmountTest() {
        try {
            contractHoldOrderService.calHoldOrderHoldFeeAmount();
            contractHoldOrderService.calHoldFeeAmountForBondAmount();
        } catch (Exception e) {
            log.info("-->", e);
        }