Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-04-06 e94d7f8203bc1a6f7e1d8d7585fbd8e9821160ee

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

@@ -200,8 +200,8 @@

    @Test
    public void wholeForceNewTest() {
        MemberEntity memberEntity = memberDao.selectById(19L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(285L);
        MemberEntity memberEntity = memberDao.selectById(15L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(400L);

        System.out.println(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrder));
    }