From bef3b23ca8918a355f6ff9751b46f4c35970f19e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 25 Oct 2020 14:09:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole' into whole
---
src/main/resources/mapper/documentary/FollowFollowerSettingDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/documentary/FollowFollowerSettingDao.xml b/src/main/resources/mapper/documentary/FollowFollowerSettingDao.xml
index 40e8066..941cd8a 100644
--- a/src/main/resources/mapper/documentary/FollowFollowerSettingDao.xml
+++ b/src/main/resources/mapper/documentary/FollowFollowerSettingDao.xml
@@ -23,7 +23,7 @@
<select id="selectAllFollowerSettingByTradeMemberId" resultType="com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity">
select a.*
from follow_follower_setting a, follow_follower_profit b
- where a.member_id=b.member_id and a.trader_member_id=#{memberId} and b.is_follow=1
+ where a.member_id=b.member_id and a.trader_member_id=b.trade_member_id and a.trader_member_id=#{memberId} and b.is_follow=1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1