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

xiaoyong931011

2021-03-26 4bfb58a3ee4a2c8be9588298c038efda3f5fe85e

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java

@@ -85,7 +85,7 @@
    }

    public String getBondAmount() {
        return bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
        return bondAmount == null ? "" : bondAmount.setScale(2, BigDecimal.ROUND_DOWN).toPlainString();
    }

    public String getForceClosingPrice() {