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

src/main/java/com/zhiwei/brandkbs2/service/impl/BehaviorServiceImpl.java

@@ -191,7 +191,7 @@ public class BehaviorServiceImpl implements BehaviorService {
         String[] collectionNames = userLogRecordDao.generateCollectionNames(start, end);
         userLogRecordDao.addSort(query, "{\"cTime\":\"descend\"}");
         if (StringUtils.isNotEmpty(nickname)) {
-            userDao.addKeywordFuzz(query, nickname, "nickname");
+            userLogRecordDao.addKeywordFuzz(query, nickname, "nickname");
         }
         long count = userLogRecordDao.count(query, collectionNames);
         List<UserLogRecord> behaviorList = new ArrayList<>();