From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +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/sales/controller/SalespersonManagementController.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
index 9b407d8..0ced35c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
@@ -3,11 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
-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.*;
@@ -20,44 +20,44 @@
*/
@RestController
@RequestMapping("/salespersonManagement")
-@Api(tags = "涓氬姟鍛樼鐞�")
+@Tag(name = "涓氬姟鍛樼鐞�")
@AllArgsConstructor
public class SalespersonManagementController extends BaseController {
private SalespersonManagementService salespersonManagementService;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
- public AjaxResult listPage(Page page, SalespersonManagement salespersonManagement) {
+ @Operation(summary = "鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
+ public R<?> listPage(Page page, SalespersonManagement salespersonManagement) {
IPage<SalespersonManagement> listPage = salespersonManagementService.listPage(page, salespersonManagement);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
- @ApiOperation("娣诲姞涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "娣诲姞涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody SalespersonManagement salespersonManagement) {
+ public R<?> add(@RequestBody SalespersonManagement salespersonManagement) {
boolean save = salespersonManagementService.save(salespersonManagement);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
- @ApiOperation("淇敼涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "淇敼涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody SalespersonManagement salespersonManagement) {
+ public R<?> update(@RequestBody SalespersonManagement salespersonManagement) {
boolean update = salespersonManagementService.updateById(salespersonManagement);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎涓氬姟鍛樹俊鎭�")
+ @Operation(summary = "鍒犻櫎涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
if (ids == null || ids.isEmpty()) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean delete = salespersonManagementService.removeByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
}
--
Gitblit v1.9.3