From 540d17e0d21a252162e9eccf021d223cdb331119 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 06 十二月 2019 17:46:14 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
index 86862f6..5ca641b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
@@ -209,11 +209,21 @@
 	public long countByType(int type);
 
 	/**
-	 * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛屽苟涓旇处鎴蜂綑棰濆ぇ浜�1鍏冿紝骞朵笖缁戝畾浜嗗井淇$殑鐢ㄦ埛鏈�2468浜�
+	 * 鍙�12棰勫敭寮�鍚椂锛屽紑鍚浼戠湢鑰佺敤鎴风殑鍞ら啋宸ヤ綔锛屽湪2019.1.1鍒�2019.6.18鏈熼棿浜х敓杩囪鍗曪紝骞朵笖2019.6.18鍙峰悗鏈啀娲昏穬锛�
+	 * 骞朵笖璐︽埛浣欓澶т簬1鍏冿紝骞朵笖缁戝畾浜嗗井淇$殑鐢ㄦ埛鏈�2468浜�
+	 * 
 	 * @param start
 	 * @param count
 	 * @return
 	 */
 	public List<UserInfo> getAutoExtractUserTo1212(int start, int count);
 
+	/**
+	 * 鏍规嵁鐢ㄦ埛ID妫�绱�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	public UserInfo selectAvailableByPrimaryKey(Long uid);
+
 }

--
Gitblit v1.8.0