fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java

@@ -151,4 +151,9 @@
     * 持仓费
     */
    private BigDecimal holdAmount;

    /**
     * 合约类型 1-普通合约 2-跟单合约
     */
    private Integer contractType;
}