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

peng

3 天以前 463add4ee035938f9622a6c981668620f097067d

 framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityRefPrizeMapper.java

@@ -1,6 +1,7 @@
package cn.lili.modules.lmk.mapper;

import cn.lili.modules.lmk.domain.entity.ActivityRefPrize;
import cn.lili.modules.lmk.domain.vo.ActivityRefPrizeInfoVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.lili.modules.lmk.domain.vo.ActivityRefPrizeVO;
@@ -33,4 +34,6 @@

    String lockPrizeRef(@Param("refId") String refId);;


    List<ActivityRefPrizeInfoVO> getActivityRefPrizeByActivityId(String prizeActivityId);
}