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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java

@@ -153,7 +153,7 @@
         

         if (!StringUtil.isNullOrEmpty(focusDTO.getMinActiveTime())) {

            Date date = TimeUtil.parseDotYYYYMMDD(focusDTO.getMinActiveTime());

            list.add(Criteria.where("joinTime").gte(date));

            list.add(Criteria.where("activeTime").gte(date));

         }



         if (!StringUtil.isNullOrEmpty(focusDTO.getMaxActiveTime())) {