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

peng

5 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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

@@ -17,6 +17,13 @@
 */
public interface PrizeActivityService extends IService<PrizeActivity> {


    /**
     * 获得打开的抽奖活动
     * @return
     */
    Result getONPrizeActivity();

    Result getPopup();
    /**
     * 设置弹窗活动