Merge branch 'master' into whole_new

Helius

2020-09-11 afc924b0d88ef320ad09060ae49804556efd8eb6

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

@@ -112,7 +112,7 @@
     */
    @Test
    public void forceSetPriceTest() {
        MemberEntity memberEntity = memberDao.selectById(5L);
        MemberEntity memberEntity = memberDao.selectById(21L);
        CalculateUtil.getForceSetPriceForWhole("BTC/USDT", memberEntity);
    }

@@ -150,4 +150,12 @@
        websocketPriceService.wholeBomb("BTC/USDT", "9000");
    }

    @Test
    public void forceTest() {
        MemberEntity memberEntity = memberDao.selectById(5L);
        CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
    }



}