fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/resources/mapper/documentary/FollowTraderInfoDao.xml

@@ -5,5 +5,9 @@
   <select id="selectFollowTraderInfoEntityBytreaderId" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">

      select * from follow_trader_info where id = #{traderId}

    </select>

    




   <select id="selectTraderInfoByMemberId" resultType="com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity">

      select * from follow_trader_info where member_id=#{memberId}

   </select>

</mapper>