From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +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/approve/controller/KnowledgeBaseController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index 3ebb782..dd12369 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -5,7 +5,8 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,7 +19,7 @@
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
@Tag(name = "鐭ヨ瘑搴撶鐞�")
-public class KnowledgeBaseController {
+public class KnowledgeBaseController extends BaseController {
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -26,35 +27,35 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
Page page = new Page(current, size);
- return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
+ return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
+ public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.save(knowledgeBase));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
+ public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.updateById(knowledgeBase));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(knowledgeBaseService.removeByIds(ids));
}
@Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
--
Gitblit v1.9.3