diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java
index c82c705..a8cfd09 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java
@@ -50,10 +50,14 @@ public class MesCalHolidayController {
     }
 
     @GetMapping("/list")
-    @Operation(summary = "获得所有假期设置列表", description = "日历组件使用，返回全量数据")
+    @Operation(summary = "获得假期设置列表", description = "支持可选日期范围过滤，不传则返回全量数据")
     @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')")
-    public CommonResult<List<MesCalHolidayRespVO>> getHolidayList() {
-        List<MesCalHolidayDO> list = holidayService.getHolidayList();
+    public CommonResult<List<MesCalHolidayRespVO>> getHolidayList(
+            @RequestParam(value = "startDay", required = false)
+            @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime startDay,
+            @RequestParam(value = "endDay", required = false)
+            @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime endDay) {
+        List<MesCalHolidayDO> list = holidayService.getHolidayList(startDay, endDay);
         return success(BeanUtils.toBean(list, MesCalHolidayRespVO.class));
     }
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java
index 869320e..cfde7a0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java
@@ -9,6 +9,9 @@ import java.time.LocalDateTime;
 @Data
 public class MesCalHolidayRespVO {
 
+    @Schema(description = "编号", example = "1024")
+    private Long id;
+
     @Schema(description = "日期")
     private LocalDateTime day;
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java
index c72466f..0a85172 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java
@@ -24,4 +24,4 @@ public class MesCalHolidaySaveReqVO {
     @Schema(description = "备注")
     private String remark;
 
-    }
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java
index 2cb0408..729bc4a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java
@@ -20,14 +20,9 @@ public interface MesCalHolidayMapper extends BaseMapperX<MesCalHolidayDO> {
         return selectOne(MesCalHolidayDO::getDay, day);
     }
 
-    default List<MesCalHolidayDO> selectList() {
+    default List<MesCalHolidayDO> selectList(LocalDateTime startDay, LocalDateTime endDay) {
         return selectList(new LambdaQueryWrapperX<MesCalHolidayDO>()
-                .orderByAsc(MesCalHolidayDO::getDay));
-    }
-
-    default List<MesCalHolidayDO> selectListByDayRange(LocalDateTime startDay, LocalDateTime endDay) {
-        return selectList(new LambdaQueryWrapperX<MesCalHolidayDO>()
-                .between(MesCalHolidayDO::getDay, startDay, endDay)
+                .betweenIfPresent(MesCalHolidayDO::getDay, startDay, endDay)
                 .orderByAsc(MesCalHolidayDO::getDay));
     }
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java
index cfc31f4..6318893 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java
@@ -23,17 +23,10 @@ public interface MesCalHolidayService {
     Long saveHoliday(@Valid MesCalHolidaySaveReqVO saveReqVO);
 
     /**
-     * 获得所有假期设置列表（用于日历显示，不分页）
+     * 获得假期设置列表
      *
-     * @return 假期设置列表
-     */
-    List<MesCalHolidayDO> getHolidayList();
-
-    /**
-     * 根据日期范围获得假期设置列表
-     *
-     * @param startDay 开始日期
-     * @param endDay   结束日期
+     * @param startDay 开始日期（可选）
+     * @param endDay   结束日期（可选）
      * @return 假期设置列表
      */
     List<MesCalHolidayDO> getHolidayList(LocalDateTime startDay, LocalDateTime endDay);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java
index 71bece7..0502794 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java
@@ -41,13 +41,8 @@ public class MesCalHolidayServiceImpl implements MesCalHolidayService {
     }
 
     @Override
-    public List<MesCalHolidayDO> getHolidayList() {
-        return holidayMapper.selectList();
-    }
-
-    @Override
     public List<MesCalHolidayDO> getHolidayList(LocalDateTime startDay, LocalDateTime endDay) {
-        return holidayMapper.selectListByDayRange(startDay, endDay);
+        return holidayMapper.selectList(startDay, endDay);
     }
 
     @Override