Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-06 7fd0771bbebafa36bc007ceb581cdaab4d290c82

 src/main/java/com/ycl/jxkg/service/impl/SubjectServiceImpl.java

@@ -29,13 +29,8 @@
    }

    @Override
    public Integer levelBySubjectId(Integer id) {
        return baseMapper.selectById(id).getLevel();
    }

    @Override
    public PageInfo<Subject> page(SubjectPageRequestVO requestVM) {
        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
        return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "item_order").doSelectPageInfo(() ->
                subjectMapper.page(requestVM)
        );
    }