fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -156,4 +156,6 @@
        CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
    }



}