Merge remote-tracking branch 'origin/master'

signal-control-service/src/main/java/net/wanji/web/service/scheme/impl/SchemeConfigServiceImpl.java

@@ -184,7 +184,11 @@ public class SchemeConfigServiceImpl implements SchemeConfigService {
         Optional<CrossAllSchemesDTO> result = filteredListWeek.stream()
                 .filter(dto -> {
                     LocalTime start = LocalTime.parse(dto.getStartTime()); // 将 startTime 转换为 LocalTime
-                    LocalTime end = LocalTime.parse(dto.getEndTime()); // 将 endTime 转换为 LocalTime
+                    String endTime = dto.getEndTime();
+                    if ("24:00".equals(endTime)){
+                        endTime = "23:59";
+                    }
+                    LocalTime end = LocalTime.parse(endTime); // 将 endTime 转换为 LocalTime
                     return (now.isAfter(start) || now.equals(start)) && now.isBefore(end); // 判断当前时间是否在 startTime 和 endTime 之间
                 })
                 .findFirst();  // 只会有一个元素