From 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 17:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 47894d0..8e3d6b6 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -47,8 +47,8 @@
      * @return
      */
     @GetMapping("/list")
-    public AjaxResult staffOnJobList() {
-        return AjaxResult.success(staffOnJobService.staffOnJobList());
+    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
     }
 
     /**

--
Gitblit v1.9.3