Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

Helius

2021-03-01 a8bc04c1c9270a2a7f28d6113bc6f097496c50aa

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

@@ -18,6 +18,9 @@

    @ApiModelProperty("交易类型 1-市价2-限价")
    private int tradeType;
    
    @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
    private int positionType;

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