From 33a69c65e1f6701bd29ef74d0681dbbe9a21cea7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jan 2021 11:19:08 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new

---
 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java |    6 ++++++
 1 files changed, 6 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 e06bff3..0e924ca 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
@@ -47,6 +47,9 @@
     @ApiModelProperty(value = "张数")
     private int symbolCnt;
 
+    @ApiModelProperty(value = "可平张数")
+    private int symbolCntSale;
+
     @ApiModelProperty(value = "回报率")
     private BigDecimal returnRate;
 
@@ -66,6 +69,9 @@
     @ApiModelProperty(value = "交易类型 1-市价 2-限价")
     private Integer tradeType;
 
+    @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
+    private Integer positionType;
+
     public String getOpeningPrice() {
         return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
     }

--
Gitblit v1.9.1