From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 68f2420..2d3fa17 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
@@ -95,8 +95,6 @@
 
 	public BigDecimal getNewPeopleHB(Long id);
 
-	public BigDecimal getMyHB(Long id);
-
 	/**
 	 * 鏌ヨ鐢ㄦ埛淇℃伅  -- 鐢ㄦ埛绠＄悊鍒楄〃
 	 * @param start
@@ -177,5 +175,13 @@
 	 * @return
 	 */
 	public UserInfo getEffectiveUserInfoByWXUnionId(String unionId);
+	
+	
+	/**
+	 * 鑾峰彇鐢ㄦ埛浣欓
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal getBalance(Long uid);
 
 }

--
Gitblit v1.8.0