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/OrderDetailVo.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
index 2939331..b35f899 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/parameter/vo/OrderDetailVo.java
@@ -22,6 +22,9 @@
@ApiModelProperty("订单类型 -1撤单,1开多,2开空,3平多,4平空")
private int orderType;
+ @ApiModelProperty("仓位类型 1-逐仓 2-全仓")
+ private int positionType;
+
@ApiModelProperty("订单编号")
private String orderNo;
--
Gitblit v1.9.1