From 9e8a8a68126721ac336b1bbc77e1f11d85a538cb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 Aug 2020 11:02:56 +0800
Subject: [PATCH] Merge branch 'master' into whole

---
 src/main/resources/mapper/contract/ContractHoldOrderDao.xml |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
index 674ff11..4096e92 100644
--- a/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
+++ b/src/main/resources/mapper/contract/ContractHoldOrderDao.xml
@@ -52,9 +52,6 @@
     <select id="selectMemberHoldOrderByPositionType" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">
         select * from contract_hold_order
         where position_type=#{positionType} and is_can_closing=1 and member_id=#{memberId}
-        <if test="orderType != null">
-            order_type=#{orderType}
-        </if>
     </select>
 
     <select id="selectWholeHoldOrderByOrderType" resultType="com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity">

--
Gitblit v1.9.1