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

gather-app/src/main/java/com/ruoyi/database/controller/TransitUserRecordController.java

@@ -69,8 +69,8 @@ public class TransitUserRecordController extends BaseController {
         }else if (transitUserRecord.getDeviceCode() == null){
             LocalDateTime now = LocalDateTime.now();
             LocalDateTime minusDay = now.minusDays(1);
-            queryWrapper.in("device_code",collect)
-                    .and(wrapper -> wrapper.isNotNull("id_card").or().isNotNull("user_name"));
+            queryWrapper.in("device_code",collect);
+//                    .and(wrapper -> wrapper.isNotNull("id_card").or().isNotNull("user_name"));
             queryWrapper.between("partition_field", formatter.format(minusDay), formatter.format(now));
         }
         queryWrapper.orderByDesc("partition_field");