From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算

---
 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