From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 09 Mar 2022 14:22:09 +0800 Subject: [PATCH] conflect merge --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java index 6bcc00b..700eafd 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java +++ b/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; -- Gitblit v1.9.1