From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index eee49ba..8e04142 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -158,5 +158,11 @@
* @return
*/
BigDecimal computeMoneyByUidAndState(@Param("uid") Long uid,@Param("stateList") List<Integer> stateList);
-
+
+ /**
+ * 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛
+ * @return
+ */
+ List<Long> getUidByNear30DayShareSucceed();
+
}
\ No newline at end of file
--
Gitblit v1.8.0