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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

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

@@ -5,6 +5,8 @@
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.ActivityRefPrizeForm;
import cn.lili.modules.lmk.domain.query.ActivityRefPrizeQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
@@ -28,6 +30,14 @@
     * @return
     */
    Result getPrizeByIdAndPrizeActivityId(String prizeId);

    /**
     * 新增奖品
     * @param prizeActivityId
     * @param list
     * @return
     */
    Result addList(String prizeActivityId,List<ActivityRefPrizeForm> list);

    /**
     * 添加
@@ -76,4 +86,6 @@
     * @return
     */
    Result all();

    String lockPrizeRef(String refId);
}