fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java

@@ -21,4 +21,6 @@


    public List<NeedMoneyMemberVo> selectAllNeedMoneyMember(@Param("list") List<String> list);



    public List<MemberEntity> selectAllMember();



}