!67 同步dev分支 Merge pull request !67 from 疯狂的狮子Li/dev

疯狂的狮子Li

2021-07-12 56322786887f99604450cde07c9cab6fb5ea5135

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -40,9 +40,7 @@
    @GetMapping("/list")
    public TableDataInfo list(SysNotice notice)
    {
        startPage();
        List<SysNotice> list = noticeService.selectNoticeList(notice);
        return getDataTable(list);
        return noticeService.selectPageNoticeList(notice);
    }

    /**