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

Helius

2021-03-31 3143298c452614a386edf9b52aa6ff618d744d90

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

@@ -201,7 +201,7 @@
    @Test
    public void wholeForceNewTest() {
        MemberEntity memberEntity = memberDao.selectById(15L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(300L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(400L);

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