From 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期二, 13 五月 2025 09:56:48 +0800 Subject: [PATCH] Merge branch 'dev_mp' into dev --- aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java index 65e0b50..95d639f 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsWorkCalendarService.java @@ -68,4 +68,11 @@ * @return */ public JSONArray getWorkCalendar(String applicableFactory, String datetime); + + /** + * 鑾峰彇鏃ュ巻瑙嗗浘鏁版嵁 + * @param apsWorkCalendar + * @return JSONArray + */ + JSONArray selectCalendarView(ApsWorkCalendar apsWorkCalendar); } -- Gitblit v1.9.3