From 3880de9f96b068dfa8b1f35fcac0060f3d4ad604 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' 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