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

huangjiayang

2025-04-27 b2d338ddc68db5b9bb824574c76d2b9b4fb07da9

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