From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/coin/dao/ZhiYaDao.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/ZhiYaDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/ZhiYaDao.java
index 3e035ac..917e7a0 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/ZhiYaDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/ZhiYaDao.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xcong.excoin.modules.coin.entity.ZhiYaEntity;
+import org.apache.ibatis.annotations.Param;
public interface ZhiYaDao extends BaseMapper<ZhiYaEntity> {
ZhiYaEntity selectByMemberId(Long memberId);
+ Long selectSumRewardByMemberIdAndRecordIdAndType(@Param("memberId")Long memberId, @Param("recordId")Long id, @Param("type")int i);
}
--
Gitblit v1.9.1