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

Helius

2021-04-07 9579b8ddd98b5e9a1170511ca75d2d07b1cded08

 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();
    }
}