From 45533a6272083948c6a19e453ca7fa5ed05b8c94 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 14 五月 2025 10:18:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsWorkCalendar.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 7064fa4..907b4ff 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
@@ -55,7 +55,40 @@
@Excel(name = "閫傜敤宸ュ簭")
private String applicableProcess;
- public void setId(Long id)
+ /** 鑺傚亣鏃� */
+ private Object holidays;
+
+ /** 閫傜敤宸ュ巶/杞﹂棿/宸ュ簭鏁扮粍 */
+ private Object applicable;
+
+ /** 閫傜敤宸ュ巶/杞﹂棿/宸ュ簭鏁扮粍 鍥炴樉 */
+ private String applicableTranslate;
+
+ public String getApplicableTranslate() {
+ return applicableTranslate;
+ }
+
+ public void setApplicableTranslate(String applicableTranslate) {
+ this.applicableTranslate = applicableTranslate;
+ }
+
+ public Object getHolidays() {
+ return holidays;
+ }
+
+ public void setHolidays(Object holidays) {
+ this.holidays = holidays;
+ }
+
+ public Object getApplicable() {
+ return applicable;
+ }
+
+ public void setApplicable(Object applicable) {
+ this.applicable = applicable;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3