From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
index e90d5d1..dba3e77 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
@@ -5,8 +5,7 @@
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.collaborativeApproval.pojo.NoticeType;
import com.ruoyi.collaborativeApproval.service.NoticeTypeService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -25,7 +24,7 @@
@RestController
@RequestMapping("/noticeType")
@AllArgsConstructor
-public class NoticeTypeController extends BaseController {
+public class NoticeTypeController {
private NoticeTypeService noticeTypeService;
@@ -35,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public R<?> add(@RequestBody NoticeType noticeType) {
- return R.ok(noticeTypeService.saveOrUpdate(noticeType));
+ public AjaxResult add(@RequestBody NoticeType noticeType) {
+ return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
}
/**
@@ -45,11 +44,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delNoticeType(@RequestBody List<Integer> ids) {
+ public AjaxResult delNoticeType(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(noticeTypeService.removeBatchByIds(ids));
+ return AjaxResult.success(noticeTypeService.removeBatchByIds(ids));
}
/**
@@ -57,8 +56,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> noticeTypeList() {
- return R.ok(noticeTypeService.list());
+ public AjaxResult noticeTypeList() {
+ return AjaxResult.success(noticeTypeService.list());
}
}
--
Gitblit v1.9.3