conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

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

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

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