Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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

@@ -29,4 +29,11 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }
    @Override
    public PageInfo<TSysActivity> pageListApp(TSysActivityQuery query) {
        PageInfo<TSysActivity> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TSysActivity> list = this.baseMapper.pageListApp(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}