Merge branch 'dev' into send_coupon

peng

3 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

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

    Result grantRecord(String prizeActivityId);
}