Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

21 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java

@@ -51,7 +51,7 @@
    @GetMapping(value = "/{noticeId}")

    public AjaxResult getInfo(@PathVariable Long noticeId)

    {

        return AjaxResult.success(noticeService.selectNoticeById(noticeId));

        return success(noticeService.selectNoticeById(noticeId));

    }



    /**