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/SchemeApplicableStaffController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index 5c53747..4abb319 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -4,11 +4,11 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-03-05 11:50:17
*/
-@Api(tags = "绀句繚鏂规閫傜敤浜哄憳琛�")
+@Tag(name = "绀句繚鏂规閫傜敤浜哄憳琛�")
@RestController
@RequestMapping("/schemeApplicableStaff")
@AllArgsConstructor
@@ -33,32 +33,32 @@
@GetMapping("/listPage")
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
}
@PostMapping("/add")
- @ApiOperation(value = "娣诲姞")
+ @Operation(summary = "娣诲姞")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.add(schemeApplicableStaff);
}
@PostMapping("/updateSchemeApplicableStaff")
- @ApiOperation(value = "淇敼")
+ @Operation(summary = "淇敼")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.UPDATE)
- public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
}
@DeleteMapping("/delete")
- @ApiOperation(value = "鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return schemeApplicableStaffService.delete(ids);
}
--
Gitblit v1.9.3