conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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

@@ -20,6 +20,9 @@
    @ApiModelProperty(value = "订单ID", example = "1")
    private Long id;

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

    @ApiModelProperty(value = "开仓均价", example = "9000.00")
    private BigDecimal openingPrice;