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

zhanghl

2025-04-27 3880de9f96b068dfa8b1f35fcac0060f3d4ad604

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java

@@ -41,7 +41,7 @@

    /** 日历内容 */
    @Excel(name = "日历内容")
    private String content;
    private Object content;

    /** 适用工厂 */
    @Excel(name = "适用工厂")
@@ -105,12 +105,12 @@
        return expiringDate;
    }

    public void setContent(String content) 
    public void setContent(Object content)
    {
        this.content = content;
    }

    public String getContent() 
    public Object getContent()
    {
        return content;
    }