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

xiaoyong931011

2021-05-25 b787caa660c2aed5281d1429d5db2ec18ac8fa7c

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

@@ -36,6 +36,6 @@
    private int type;

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