Merge branch 'dev' into user_action

peng

10 天以前 8f28585b36a060825f4ea59fd2301872a34c6901

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

@@ -31,4 +31,5 @@
    */
    IPage getPage(IPage page, @Param("query") PrizeGrantRecordQuery query);

    List<PrizeGrantRecordVO> getExportData(@Param("query") PrizeGrantRecordQuery query);
}