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

zxl

20 小时以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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