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

peng

3 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

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

@@ -1,10 +1,12 @@
package cn.lili.modules.lmk.service;

import cn.lili.modules.lmk.domain.entity.PrizeActivity;
import cn.lili.modules.lmk.domain.vo.PrizeDetailVO;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.PrizeActivityForm;
import cn.lili.modules.lmk.domain.query.PrizeActivityQuery;

import java.util.List;

/**
@@ -71,4 +73,7 @@
     * @return
     */
    Result all();

    PrizeDetailVO prizeInfo(String id);

}