Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 baed9b68c8cb6b693d3c010f039d2c55bf242e0e

 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);
    }
}