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

zxl

4 天以前 e00e10418b01eb0ee442b2dc4029925fba7ae33b

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

@@ -34,6 +34,8 @@
    */
    IPage getPage(IPage page, @Param("query") PrizeRecordQuery query);

    IPage getByUserIdPage(IPage page, @Param("query") PrizeRecordQuery query,@Param("userId") String userId);

    List<PrizeRecordTimeVO> getPrizeRecordListByTime(@Param("query") PrizeRecordTimeQuery query);

    List<PrizeRecordVO> getExportData(@Param("query")PrizeRecordQuery query);