Merge remote-tracking branch 'origin/div' into div

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 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;