From e66f29c66573e71a198b985e2d7f971a7577f2ee Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Fri, 15 Aug 2025 15:56:48 +0800
Subject: [PATCH] 1
---
.../dromara/property/domain/AttendanceArrangement.java | 8 ++++----
.../property/domain/bo/AttendanceArrangementBo.java | 8 ++++----
.../property/domain/vo/AttendanceArrangementVo.java | 10 +++++-----
ruoyi-modules/pom.xml | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java
index 746ff5e7..610c9ff7 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java
@@ -41,10 +41,10 @@ public class AttendanceArrangement extends TenantEntity {
*/
private Long groupId;
- /**
- * 区域id
- */
- private Long areaId;
+// /**
+// * 区域id
+// */
+// private Long areaId;
/**
* 排班类型:1-固定班制,2-排班制
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java
index 807be3b0..8ea4e355 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java
@@ -45,10 +45,10 @@ public class AttendanceArrangementBo extends BaseEntity {
*/
private Long groupId;
- /**
- * 区域id
- */
- private Long areaId;
+// /**
+// * 区域id
+// */
+// private Long areaId;
/**
* 排班类型:1-固定班制,2-排班制
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java
index 61b6644b..f53ae519 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java
@@ -45,11 +45,11 @@ public class AttendanceArrangementVo implements Serializable {
@ExcelProperty(value = "考勤组ID")
private Long groupId;
- @ExcelProperty(value = "区域Id")
- /**
- * 区域id
- */
- private Long areaId;
+// @ExcelProperty(value = "区域Id")
+// /**
+// * 区域id
+// */
+// private Long areaId;
/**
* 排班类型:1-固定班制,2-排班制
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index bb867d3f..3e55175f 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -15,7 +15,7 @@
ruoyi-resource
ruoyi-workflow
Property
-
+ Sis
ruoyi-modules