Merge branch 'dev_New_pro' into dev_New_pro_财务

zss

2026-05-21 8933e08a39682a0bfc75cb79166dcb24a6d54ec3

 src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java

@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;