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

peng

16 小时以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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