From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index fd97213..4abb319 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -4,7 +4,7 @@
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.v3.oas.annotations.tags.Tag;
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
}
@@ -42,7 +42,7 @@
@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);
}
@@ -50,7 +50,7 @@
@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);
}
@@ -58,7 +58,7 @@
@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