Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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