Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

 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);
}