From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
index e4596ce..0296a5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/user/invite/TeamFansInfoDao.java
+++ b/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())) {
--
Gitblit v1.8.0