Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2 天以前 3033ccf3878fae2c204df53be2a283f29f5853ed

 ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TSysActivity;
import com.ruoyi.system.query.TSysActivityQuery;
import com.ruoyi.system.vo.TSysActivityVO;

/**
 * <p>
@@ -20,7 +21,7 @@
     * @param query
     * @return
     */
    PageInfo<TSysActivity> pageList(TSysActivityQuery query);
    PageInfo<TSysActivityVO> pageList(TSysActivityQuery query);
    /**
     * 获取热门活动分页列表
     * @param query