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

Helius

2020-08-28 17b12b82967c65d170b7bda3c79e3aa76ecfa746

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

@@ -60,7 +60,12 @@
     */
    public static final int ORDER_TYPE_CLOSE_LESS = 4;


    /**
     * 订单类型1普通合约2跟单合约
     */
    private int contractType;
    public static final int CONTRACTTYPE_NORMAL = 1;
    public static final int CONTRACTTYPE_DOCUMENTARY = 2;
    /**
     * 会员Id
     */