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

zhanghl

2025-04-23 ab0b4b2397c46701e372a49cf8ff4d268bb577b3

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java

@@ -95,4 +95,15 @@
    {
        return toAjax(apsWorkCalendarService.deleteApsWorkCalendarByIds(ids));
    }

    /**
     * 查询日历管理列表
     */
    @RequiresPermissions("aps:calendar:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsWorkCalendar apsWorkCalendar)
    {
        List<ApsWorkCalendar> list = apsWorkCalendarService.selectApsWorkCalendarList(apsWorkCalendar);
        return AjaxResult.success(list);
    }
}