Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

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

@@ -18,6 +18,7 @@
        <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
@@ -30,4 +31,14 @@
    <select id="selectAllEntrustOrder" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
    </select>

    <select id="selectMemberEntrustOrderByPositionType" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
        where position_type=#{positionType} and member_id=#{memberId}
    </select>

    <select id="selectEntrustOrderByOrderNo" resultType="com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity">
        select * from contract_entrust_order
        where order_no=#{orderNo}
    </select>
</mapper>