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

Helius

2020-09-29 5cf08fb67c6491eac16ce986306108c4fce77ed9

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

@@ -64,6 +64,8 @@
     * 订单类型1普通合约2跟单合约
     */
    private int contractType;
    public static final int CONTRACTTYPE_NORMAL = 1;
    public static final int CONTRACTTYPE_DOCUMENTARY = 2;
    /**
     * 会员Id
     */