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

Helius

2020-09-24 3e32ab49044296b0147bf0a37370375e38df41a2

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