From 0d564acb20296f5f289d0fedfc1b09ef421892a3 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_zss' into pim_ywx
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 19fb2bf..ca54c4c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.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;
@@ -16,7 +17,7 @@
*/
@TableName(value = "staff_on_job")
@Data
-public class StaffOnJob implements Serializable {
+public class StaffOnJob extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
--
Gitblit v1.9.3