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

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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

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

    Result grantRecord(String prizeActivityId);
}