Merge branch 'master' into whole_new

Helius

2020-09-10 6b9b8b50fbefd21479197ccfa9abfe039e04f1d6

 src/main/resources/mapper/member/MemberDao.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.xcong.excoin.modules.member.dao.MemberDao">

    <select id="selectMemberInfoByAccount" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
        select * from member where phone=#{account} or email=#{account}
        select * from member where phone=#{account} or email=#{account} or invite_id=#{account}
    </select>

    <select id="selectMemberInfoByInviteId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">