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/controller/client/v2/InviteControllerV2.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index a837701..3cdbc93 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -905,6 +905,7 @@
 				|| focus.getMinFansNum() != null || focus.getMinFansNum() != null
 				|| focus.getMinActiveTime() != null || focus.getMaxActiveTime() != null
 				|| focus.getMinIncome() != null  || focus.getMaxIncome() != null 
+			    || focus.getMinJoinTime() != null  || focus.getMaxJoinTime() != null 
 				|| !StringUtil.isNullOrEmpty(focus.getKey()) || !StringUtil.isNullOrEmpty(focus.getLevel()))
 			 return true;
 	

--
Gitblit v1.8.0