Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-06-05 01aa2cc5c8fafd89ff763bfb0016c4983ff79648

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java

@@ -19,9 +19,12 @@
    @ApiModelProperty("订单ID")
    private Long id;

    @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
    @ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
    private int orderType;

    @ApiModelProperty("订单状态 1成交 2撤单")
    private int orderStatus;

    @ApiModelProperty("开仓均价")
    private BigDecimal openingPrice;