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

zainali5120

2021-05-12 2720d8d8e2ea1a03e6dd42809d75f788349f66c8

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

@@ -18,6 +18,7 @@
   FollowFollowerOrderRelationEntity selectNowOneByorderId(@Param("orderId")Long orderId);

   List<FollowFollowerOrderRelationEntity> selectFollowHoldOrderByTradeOrderNo(@Param("orderNo") String orderNo);
   List<FollowFollowerOrderRelationEntity> selectFollowOrderByTradeOrderNo(@Param("orderNo") String orderNo);

   BigDecimal selectTraderTotalProfit(@Param("memberId") Long memberId);
   BigDecimal selectTraderTotalProfitSelf(@Param("memberId") Long memberId);