Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-28 ffca7fc095a9111837dfd82288faef450b749f69

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

@@ -34,4 +34,8 @@

    @ApiModelProperty(value = "委托类型 1-开多 2-开空")
    private int type;

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