From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
index 1279184..aa1d325 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamEincomeRecordMapper.java
@@ -3,14 +3,18 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.yeshi.fanli.dao.BaseMapper;
 import com.yeshi.fanli.entity.money.TeamEincomeRecord;
 
 public interface TeamEincomeRecordMapper extends BaseMapper<TeamEincomeRecord> {
 
-	TeamEincomeRecord selectByUidAndPreRecieveTimeAndType(Long uid, Date preRecieveTime, int type);
-	
-	TeamEincomeRecord	selectByPrimaryKeyForUpdate(Long id);
+	TeamEincomeRecord selectByUidAndPreRecieveTimeAndType(@Param("uid") Long uid,
+			@Param("preRecieveTime") Date preRecieveTime, @Param("type") int type);
 
-	List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(Long uid, Date preRecieveTime, int state);
+	TeamEincomeRecord selectByPrimaryKeyForUpdate(Long id);
+
+	List<TeamEincomeRecord> listByUidAndPreRecieveTimeAndState(@Param("uid") Long uid,
+			@Param("preRecieveTime") Date preRecieveTime, @Param("state") int state);
 }
\ No newline at end of file

--
Gitblit v1.8.0