Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 8635f0ece99df340535466e9b6207c6ecf1b8a4d

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

@@ -21,4 +21,10 @@
     * @return
     */
    PageInfo<TSysActivity> pageList(TSysActivityQuery query);
    /**
     * 获取热门活动分页列表
     * @param query
     * @return
     */
    PageInfo<TSysActivity> pageListApp(TSysActivityQuery query);
}