Merge remote-tracking branch 'origin/master' into pim_yys

maven

2 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java

@@ -36,6 +36,15 @@
    }

    /**
     * 在职员工下拉(新增离职用)
     * @return
     */
    @GetMapping("/list")
    public AjaxResult staffOnJobList() {
        return AjaxResult.success(staffOnJobService.staffOnJobList());
    }

    /**
     * 在职员工详情
     * @param staffNo
     * @return