conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

@@ -23,6 +23,9 @@
    @ApiModelProperty("交易类型 1-市价2-限价")
    private int tradeType;

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

    @ApiModelProperty("币种")
    private String symbol;