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

zxl

2 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 framework/src/main/java/cn/lili/modules/lmk/service/PrizeRecordService.java

@@ -57,6 +57,8 @@
     */
    Result page(PrizeRecordQuery query);

    Result pageByUserId(PrizeRecordQuery query);

    /**
     * 根据id查找
     * @param id