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

peng

3 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

 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);
    /**
     * 添加