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

peng

1 天以前 9b9e43adee86384abdcbc50af29c7ba68b818fb7

 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();
    /**
     * 设置弹窗活动