Merge branch 'master' into whole

Helius

2020-08-14 9e8a8a68126721ac336b1bbc77e1f11d85a538cb

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

@@ -156,4 +156,9 @@
     * 合约类型 1-普通合约 2-跟单合约
     */
    private Integer contractType;

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