fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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