Merge branch 'master' into whole

Helius

2020-08-14 9e8a8a68126721ac336b1bbc77e1f11d85a538cb

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

@@ -31,4 +31,9 @@
    <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>
</mapper>