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

zxl

9 天以前 8063ee7eee51bfe25a09428e6efc60f828b270c6

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

@@ -48,6 +48,5 @@
    int batchUpdateActivities(@Param("list") List<Activity> activityList);




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