From 829d77f7145514d67d957ad54dbef854440f77d3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 31 Jul 2020 17:05:08 +0800
Subject: [PATCH] fix conflect
---
src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml b/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
index ff812a6..73cfc88 100644
--- a/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
+++ b/src/main/resources/mapper/documentary/FollowTraderProfitInfoDao.xml
@@ -7,6 +7,10 @@
order by id desc
</select>
+ <select id="selectOneByMemberId" resultType="com.xcong.excoin.modules.documentary.vo.FollowTraderProfitInfoVo">
+ select * from follow_trader_profit_info where member_id = #{memberId}
+ </select>
+
<select id="selectHistoryOrderRecords" resultType="com.xcong.excoin.modules.documentary.vo.HistoryOrderRecordsVo">
SELECT
symbol,
--
Gitblit v1.9.1