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/collaborativeApproval/controller/StaffContactsPersonalController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index 0b924df..fa72a40 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -4,35 +4,36 @@
import com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO;
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/staffContactsPersonal")
@AllArgsConstructor
-public class StaffContactsPersonalController {
+public class StaffContactsPersonalController extends BaseController {
private StaffContactsPersonalService staffContactsPersonalService;
@GetMapping("/getList")
- @ApiOperation("鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
- return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
+ @Operation(summary = "鍒嗛〉鏌ヨ")
+ public R<?> listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
+ return R.ok(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
- return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
+ @Operation(summary = "鏂板")
+ public R<?> add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
+ return R.ok(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
- @ApiOperation("鍒犻櫎")
- public AjaxResult delete(@PathVariable("id") Long id) {
+ @Operation(summary = "鍒犻櫎")
+ public R<?> delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
// }
- return AjaxResult.success(staffContactsPersonalService.removeById(id));
+ return R.ok(staffContactsPersonalService.removeById(id));
}
}
--
Gitblit v1.9.3