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

huangjiayang

2025-05-09 77b9b1492b8578b280bd61e15896de5bdc8e5213

 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);
}