Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

@@ -30,5 +30,5 @@
    *  分页
    */
    IPage getPage(IPage page, @Param("query") StoreCouponClaimRecordQuery query);

    List<StoreCouponClaimRecordVO> getExportData(@Param("query") StoreCouponClaimRecordQuery query);
}