Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-13 17fb78903b310564aaeea6e4fd50824f45d4677a

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

@@ -46,7 +46,7 @@
                </if>
            </where>
        </if>
        order by create_time desc
        order by create_time desc, id desc
    </select>

    <select id="selectOrderDetailByIdAndMemberId" resultType="com.xcong.excoin.modules.contract.entity.ContractOrderEntity">