From 0b7e2752b6f1e87084b837043291c890cca780a8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 15 十月 2025 19:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
index 74b8fe2..5b77a38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -51,7 +52,8 @@
*/
@ApiOperation("消息通知分页列表")
@PostMapping("/pageList")
- public R<PageInfo<NotificationVO>> pageList(@RequestBody NotificationListQuery query) {
+ public R<PageInfo<NotificationVO>> pageList(@RequestBody NotificationListQuery query
+ ) {
return R.ok(oaNotificationService.pageList(query));
}
@@ -164,7 +166,7 @@
}
notificationDetailVO.setNotificationUserDetailVOS(notificationUserDetailVOS);
- return R.ok();
+ return R.ok(notificationDetailVO);
}
}
--
Gitblit v1.7.1