Merge branch 'master' of http://111.47.6.224:3000/udream-cxs/lift-server.git

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/LiftDataService.java

@@ -299,7 +299,7 @@ public class LiftDataService {
         if (liftDataModelList != null && liftDataModelList.size() > 0) {
             return liftDataModelList.stream().filter(liftDataModel -> {
                 if (liftDataModel.getConnectTime() != null) {
-                    return liftDataModel.getConnectTime().isAfter(liftDataRequest.getStartTimeDate()) ||
+                    return liftDataModel.getConnectTime().isAfter(liftDataRequest.getStartTimeDate()) &&
                             liftDataModel.getConnectTime().isBefore(liftDataRequest.getEndTimeDate());
                 }
                 return false;