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

zxl

2025-07-11 4e6d6e7c8e4ca42e96528a71162f5e58e473f652

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

@@ -36,6 +36,8 @@
    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);
@@ -48,6 +50,5 @@
    int batchUpdateActivities(@Param("list") List<Activity> activityList);




    IPage getCanReportPage(IPage page,@Param("query")  ActivityQuery query);
}