fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java

@@ -50,4 +50,14 @@
        blockCoinService.updateBtc();
    }

    @Scheduled(cron = "0 4/20 * * * ? ")
    public void eosUpdate() {
        blockCoinService.updateEos();
    }

    @Scheduled(cron = "0 6/20 * * * ? ")
    public void xrpUpdate() {
        blockCoinService.updateXrp();
    }

}