fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

@@ -38,5 +38,9 @@
         @Param("memberId")Long memberId);

   int updateFollowerProfitByTradeMemberId(@Param("principal") BigDecimal principal, @Param("profit") BigDecimal profit, @Param("tradeMemberId") Long tradeMemberId, @Param("memberId") Long memberId);

   int selectFollowerCntByTradeMemberId(@Param("tradeMemberId") Long tradeMemberId);

   BigDecimal selectAllFollowerProfit(@Param("tradeMemberId") Long tradeMemberId);
   
}