Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-07 ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef

 src/main/resources/mapper/contract/ContractEntrustOrderDao.xml

@@ -11,6 +11,15 @@
        select * from contract_entrust_order
        where member_id=#{memberId}
    </select>

    <select id="selectEntrustOrderListByMemberIdAndSymbol" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
        where member_id=#{memberId}
        <if test="symbol != null and symbol !=''">
            and symbol=#{symbol}
        </if>
        order by create_time desc
    </select>
    <select id="selectEntrustOrderListByIds" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
        where id in