diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java
index ea07071..0e57cd7 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java
@@ -59,10 +59,6 @@ public class AttendanceClockDate extends TenantEntity {
      */
     private String reason;
 
-    /**
-     * 创建人
-     */
-    private Long createdBy;
 
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java
index 2a830fd..6c0cbe0 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java
@@ -58,10 +58,6 @@ public class AttendanceClockDateBo extends BaseEntity {
      */
     private String reason;
 
-    /**
-     * 创建人
-     */
-    private Long createdBy;
 
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java
index 54b6eec..8a004f3 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java
@@ -73,11 +73,6 @@ public class AttendanceClockDateVo implements Serializable {
     @ExcelProperty(value = "必须/无需打卡原因")
     private String reason;
 
-    /**
-     * 创建人
-     */
-    @ExcelProperty(value = "创建人")
-    private Long createdBy;
 
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java
index a56b12d..44c1c8f 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java
@@ -1,15 +1,12 @@
 package org.dromara.property.domain.vo;
 
-import org.dromara.property.domain.AttendanceGroup;
+import org.dromara.property.domain.*;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.property.domain.AttendanceShift;
-import org.dromara.property.domain.AttendanceWeekSet;
-import org.dromara.property.domain.AttendanceWeeksetShift;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -62,5 +59,7 @@ public class AttendanceGroupVo implements Serializable {
 
     List<AttendanceShift> attendanceList;
 
+    List<AttendanceClockDate> clockDateList;
+
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java
index a0f9b40..dcc7469 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java
@@ -80,7 +80,7 @@ public class AttendanceClockDateServiceImpl implements IAttendanceClockDateServi
         lqw.eq(bo.getStartDate() != null, AttendanceClockDate::getStartDate, bo.getStartDate());
         lqw.eq(bo.getEndDate() != null, AttendanceClockDate::getEndDate, bo.getEndDate());
         lqw.eq(StringUtils.isNotBlank(bo.getReason()), AttendanceClockDate::getReason, bo.getReason());
-        lqw.eq(bo.getCreatedBy() != null, AttendanceClockDate::getCreatedBy, bo.getCreatedBy());
+//        lqw.eq(bo.getCreateBy() != null, AttendanceClockDate::getCreateBy, bo.getCreateBy());
         return lqw;
     }
 
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
index 1765c71..4c6702f 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
@@ -91,6 +91,10 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
             vo.setAttendanceList(shifts);
         }
 
+        //根据id查询attendance_clock_date表
+        List<AttendanceClockDate> clockDates = attendanceClockDateMapper.selectList(Wrappers.<AttendanceClockDate>lambdaQuery().eq(AttendanceClockDate::getGroupId, id));
+        vo.setClockDateList(clockDates);
+
 
         return vo;
     }