Merge remote-tracking branch 'origin/whole_new' into whole_new

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 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;