From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/staff/controller/StaffContractController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
index 9a9f562..59908ba 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
@@ -1,10 +1,11 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
@@ -14,8 +15,8 @@
*/
@RestController
@RequestMapping("/staff/staffContract")
-@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
-public class StaffContractController {
+@Tag(name = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
+public class StaffContractController extends BaseController {
@Resource
private StaffContractService staffContractService;
@@ -28,7 +29,7 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffContractListPage(Page page, StaffContract staffContract) {
- return AjaxResult.success(staffContractService.staffContractListPage(page, staffContract));
+ public R<?> staffContractListPage(Page page, StaffContract staffContract) {
+ return R.ok(staffContractService.staffContractListPage(page, staffContract));
}
}
--
Gitblit v1.9.3