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

zxl

4 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

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

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


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

    Result getPopup();
    /**
     * 设置弹窗活动
     * @param id
     * @return
     */
    Result popup(String id);

    Result publishPrizeActivity(String id);
    /**
     * 添加