merge master

Helius

2020-08-13 a7b8fd2b18e652730cd4e48da61adee89564b4b6

 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">