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

zxl

9 天以前 09c1e21cad0b474babb1d2f67f481b582adf0b0f

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

@@ -35,7 +35,10 @@
    */
    IPage getPage(IPage page, @Param("query") ActivityQuery query);


    /**
     *  商家端端分页
     */
    IPage storeGetPage(IPage page, @Param("query") ActivityQuery query);


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