From 5394194396290aa232910a571d6f4ef463a92a6b Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 07 Apr 2021 11:23:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java index 4515800..bff7cc7 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java @@ -3,6 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.matrix.system.activity.entity.ActivitySignAwardSet; +import com.matrix.system.shopXcx.api.vo.ActivitySignAwardSetVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @description 奖品设置表 @@ -11,4 +15,6 @@ */ public interface ActivitySignAwardSetDao extends BaseMapper<ActivitySignAwardSet>{ + List<ActivitySignAwardSetVo> selectListByActIDAndCompanyId(@Param("actId")Long actId, @Param("companyId")Long companyId,@Param("awardState")int awardstateWork); + } \ No newline at end of file -- Gitblit v1.9.1