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

peng

2 天以前 803a61d1d89e75f0b5d72785069b3dceb579f3ca

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

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

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

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