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

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

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

@@ -42,9 +42,7 @@
    @GetMapping("/list")
    public TableDataInfo list(SysPost post)
    {
        startPage();
        List<SysPost> list = postService.selectPostList(post);
        return getDataTable(list);
        return postService.selectPagePostList(post);
    }
    
    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)