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

peng

5 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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

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

    Result grantRecord(String prizeActivityId);
}