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

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

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

@@ -198,4 +198,12 @@
        // 29157.72306836 --
    }

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

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

}