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

xiaoyong931011

2021-01-29 4a8c4e149d3c1ee75e99d64632d71eab454f30b6

 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;