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

xiaoyong931011

2021-05-14 419ab2e6ed630e789f35456fa98e16dd2cc01fc6

 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(4, BigDecimal.ROUND_DOWN).toPlainString();
        return bondAmount == null ? "" : bondAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }
}