Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-07-14 ab95fdd0d06f409b4f41ff9696f292248e86d9bc

 framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java

@@ -31,11 +31,13 @@
    ActivityVO getById(String id);

    /**
    *  分页
    *  管理端分页
    */
    IPage getPage(IPage page, @Param("query") ActivityQuery query);




    IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);

    List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query,@Param("userId") String userId);