Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

sfd

2025-05-08 961ac0196685096572ee838c68585dc8faace8d8

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