From bec1e27df1cce02f0a4b9aa19a2fc50f4551fb64 Mon Sep 17 00:00:00 2001 From: huangjiayang <5265313@qq.com> Date: 星期日, 27 四月 2025 15:00:28 +0800 Subject: [PATCH] 【UPDATE】1.新增或修改日历数据时验证有效日期和失效日期是否重叠 2.增加日历视图页面接口 --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java index 5387157..7064fa4 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java +++ b/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; } -- Gitblit v1.9.3