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

wzy

2020-11-29 18ec469960104139455f8a3863e3c9e8fb1f32d2

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

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

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