Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

Helius

2020-08-19 11d8692e517431030ba0ce36b437601cf83cdec3

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

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

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

    /**
     * 已实现盈亏
     */
    private BigDecimal rewardAmount;
}