From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java
index c8d7612..b1d5789 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralExchangeRecordMapper.java
@@ -1,18 +1,18 @@
-package com.yeshi.fanli.dao.mybatis.integral;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.integral.IntegralExchangeRecord;
-
-public interface IntegralExchangeRecordMapper extends BaseMapper<IntegralExchangeRecord> {
-	
-
-	/**
-	 *  缁熻浠婃棩鍏戞崲鎯呭喌
-	 * @param list
-	 * @return
-	 */
-	long countRecordByUid(@Param("exchangeId") Long exchangeId, @Param("uid") Long uid);
-	
+package com.yeshi.fanli.dao.mybatis.integral;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.integral.IntegralExchangeRecord;
+
+public interface IntegralExchangeRecordMapper extends BaseMapper<IntegralExchangeRecord> {
+	
+
+	/**
+	 *  缁熻浠婃棩鍏戞崲鎯呭喌
+	 * @param list
+	 * @return
+	 */
+	long countRecordByUid(@Param("exchangeId") Long exchangeId, @Param("uid") Long uid, @Param("today") Integer today);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0