fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderProfitInfoDao.java

@@ -19,4 +19,5 @@


   FollowTraderProfitInfoVo selectOneByMemberId(@Param("memberId")long memberId);



   FollowTraderProfitInfoEntity selectTraderInfoProfitByMemberId(@Param("memberId") Long memberId);

}