Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-04-25 a55747a7cedc4c4f04f33755a27862c959c1ad30

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

@@ -48,5 +48,6 @@
   BigDecimal selectSumBondAmountBymemberId(@Param("memberId")Long memberId,@Param("tradeId") Long tradeId);

   BigDecimal selectSumRewardAmountByMemberId(@Param("memberId")Long memberId,@Param("tradeId") Long tradeId);
	

   List<BigDecimal> selectBondAmountByTradeIdAndMemberId(@Param("memberId")Long memberId,@Param("tradeId") Long tradeId);
}