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

zxl

4 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

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

@@ -69,4 +69,6 @@
     * @return
     */
    Result all();

    Result grantRecord(String prizeActivityId);
}