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

peng

7 天以前 61c5deee6619789d3a2711684ea14cc51b061cdf

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