From 01aa2cc5c8fafd89ff763bfb0016c4983ff79648 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Fri, 05 Jun 2020 19:33:20 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderListVo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 6ae45fe..8d99c52 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
@@ -19,9 +19,12 @@
     @ApiModelProperty("订单ID")
     private Long id;
 
-    @ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
+    @ApiModelProperty("订单类型 1开多,2开空,3平多,4平空")
     private int orderType;
 
+    @ApiModelProperty("订单状态 1成交 2撤单")
+    private int orderStatus;
+
     @ApiModelProperty("开仓均价")
     private BigDecimal openingPrice;
 

--
Gitblit v1.9.1