From 9031180e72e881827c30e757237a63ce9304c149 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 31 May 2020 22:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index c39e3d1..52166a3 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -58,7 +58,7 @@
     /**
      * 仓位类型 1-逐仓 2-全仓
      */
-    private int potionType;
+    private int positionType;
 
     /**
      * 交易类型 1-市价 2-限价

--
Gitblit v1.9.1