Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TKnowledgeMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.applet.query.KnowledgeListUserQuery;
import com.ruoyi.system.applet.vo.KnowledgeVO;
import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.vo.system.KnowledgeListVO;
@@ -20,4 +22,6 @@
public interface TKnowledgeMapper extends BaseMapper<TKnowledge> {

    List<KnowledgeListVO> pageList(@Param("query")KnowledgeListQuery query, @Param("pageInfo")PageInfo<KnowledgeListVO> pageInfo);

    List<KnowledgeVO> pageListUser(@Param("query")KnowledgeListUserQuery query, @Param("pageInfo")PageInfo<KnowledgeVO> pageInfo);
}