From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index bdd8077..d2ce38d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
*/
@TableName(value = "staff_join_leave_record")
@Data
-public class StaffJoinLeaveRecord implements Serializable {
+public class StaffJoinLeaveRecord extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
--
Gitblit v1.9.3