From a85bfc6971d421ec51dd7104c88f148368b80a4d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 11 Aug 2020 11:29:27 +0800 Subject: [PATCH] Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow --- src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java index 24701bb..9171e94 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java +++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.web3j.abi.datatypes.Int; import java.math.BigDecimal; import java.util.Date; @@ -63,6 +64,9 @@ @ApiModelProperty(value = "交易类型 1-市价 2-限价") private Integer tradeType; + @ApiModelProperty(value = "合约类型 1-普通 2-跟单") + private Integer contractType; + public String getOpeningFeeAmount() { return openingFeeAmount == null ? "" : openingFeeAmount.setScale(4, BigDecimal.ROUND_DOWN).toPlainString(); } -- Gitblit v1.9.1