conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

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

    @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
    private int positionType;

    @ApiModelProperty("订单编号")
    private String orderNo;