From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index d2fa05e..47c9ef8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -206,6 +206,7 @@
 	 * @param count
 	 * @return
 	 */
+
 	List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count,
 			@Param("money") BigDecimal money, @Param("beganDate") String beganDate, @Param("endDate") String endDate);
 
@@ -219,4 +220,12 @@
 	List<UserInfo> listByType(@Param("type")int type,@Param("start") long start, @Param("count")int count);
 
 	long countByType(int type);
+	
+	/**
+	 * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+	 * @param start
+	 * @param count
+	 * @return
+	 */
+	List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
 }
\ No newline at end of file

--
Gitblit v1.8.0