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

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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

@@ -12,4 +12,6 @@

    Result prizeInfo(String prizeActivityId);

    Result grantRecord( String prizeActivityId);

}