From af2f1450e22d4b65e0013733e08025cdcd075b31 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
index b679767..88f8355 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsWorkCalendarController.java
+++ b/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);
+ }
}
--
Gitblit v1.9.3