From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index 64a35d9..585a249 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -1,7 +1,8 @@
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.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/staff/staffLeave")
@Tag(name = "鍛樺伐绂昏亴")
-public class StaffLeaveController {
+public class StaffLeaveController extends BaseController {
@Resource
private StaffLeaveService staffLeaveService;
/**
@@ -28,8 +29,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
+ public R<?> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
}
/**
@@ -38,8 +39,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
+ public R<?> add(@RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.add(staffLeaveDto));
}
/**
@@ -49,8 +50,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.update(id, staffLeaveDto));
}
/**
@@ -59,11 +60,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult del(@RequestBody List<Integer> ids) {
+ public R<?> del(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffLeaveService.del(ids));
+ return R.ok(staffLeaveService.del(ids));
}
/**
--
Gitblit v1.9.3