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/warehouse/controller/DocumentClassificationController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index 5df6ba7..a02f8bd 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -3,11 +3,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.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
-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.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +15,7 @@
import java.util.List;
@RestController
-@Api(tags = "鏂囨。鍒嗙被")
+@Tag(name = "鏂囨。鍒嗙被")
@RequestMapping("/warehouse/documentClassification")
@AllArgsConstructor
public class DocumentClassificationController extends BaseController {
@@ -23,30 +23,30 @@
//鏍戠粨鏋�
@GetMapping("/getList")
- public AjaxResult getList() {
- return AjaxResult.success(documentClassificationService.selectDocumentClassificationList());
+ public R<?> getList() {
+ return R.ok(documentClassificationService.selectDocumentClassificationList());
}
@PostMapping("/add")
- @ApiOperation("鏂囨。鍒嗙被-娣诲姞")
+ @Operation(summary = "鏂囨。鍒嗙被-娣诲姞")
@Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
- return AjaxResult.success(documentClassificationService.save(documentClassification));
+ public R<?> add(@RequestBody DocumentClassification documentClassification) {
+ return R.ok(documentClassificationService.save(documentClassification));
}
@PutMapping("/update")
- @ApiOperation("鏂囨。鍒嗙被-鏇存柊")
+ @Operation(summary = "鏂囨。鍒嗙被-鏇存柊")
@Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
- return AjaxResult.success(documentClassificationService.updateById(documentClassification));
+ public R<?> update(@RequestBody DocumentClassification documentClassification) {
+ return R.ok(documentClassificationService.updateById(documentClassification));
}
@DeleteMapping("/delete")
- @ApiOperation("鏂囨。鍒嗙被鍒犻櫎")
+ @Operation(summary = "鏂囨。鍒嗙被鍒犻櫎")
@Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentClassificationService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentClassificationService.deleteByIds(ids));
}
}
--
Gitblit v1.9.3