Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 b248e201845e9704cf01f7ac723a64e2570039f4

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TKnowledgeServiceImpl.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.applet.query.KnowledgeListUserQuery;
import com.ruoyi.system.applet.vo.KnowledgeVO;
import com.ruoyi.system.mapper.TKnowledgeMapper;
import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.query.KnowledgeListQuery;
@@ -30,4 +32,11 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public PageInfo<KnowledgeVO> pageListUser(KnowledgeListUserQuery query) {
        PageInfo<KnowledgeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<KnowledgeVO> list = this.baseMapper.pageListUser(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}