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

zxl

5 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

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

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

    Result grantRecord(String prizeActivityId);
}