From 674bfe588f4360afdbeae9a725dca4b8e995e326 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 20:32:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
index 9810fc3..cdb7685 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java
@@ -133,7 +133,7 @@
 	}
 	
 	@Override
-	public void addFansInfo(Long workerId, Long bossId) {
+	public void addFansInfo(Long workerId, Long bossId, Date successTime) {
 		UserInfo userInfo = userInfoService.selectByPKey(workerId);
 		if (userInfo == null) {
 			return;
@@ -228,6 +228,7 @@
 		focusInfo.setBossId(bossId);
 		focusInfo.setWorkerId(workerId);
 		focusInfo.setBossSuperId(bossSuperId);
+		focusInfo.setJoinTime(successTime);
 		focusInfo.setNickName(userInfo.getNickName());
 		focusInfo.setMemoName(memoName);
 		focusInfo.setWeixinIdExist(weixinBind);
@@ -245,9 +246,6 @@
 		focusInfo.setId(workerId.toString());
 		save(focusInfo);
 	}
-	
-	
-	
 	
 	
 	@Override

--
Gitblit v1.8.0