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

peng

4 天以前 f931144c06ce670ee0eb7384ea05cde4c4497dd3

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