fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -28,6 +28,6 @@
    @Test
    public void bombTest() {

        websocketPriceService.comparePriceDesc("BTC/USDT", "9726.8");
        websocketPriceService.comparePriceDesc("BTC/USDT", "9608");
    }
}