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

Helius

2020-09-04 1c9cf8c8237f739f3e62beaa637e48cc8077e934

 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
     */