From 55b3bd7821f14db9e9441d8b34fb9bdc1a9e4df7 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期六, 14 三月 2020 11:11:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index e8552bb..8e8aec4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -207,7 +207,7 @@
 	 * @param list 绫诲瀷
 	 * @return
 	 */
-	long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,
+	Long countValidOrderByUidAndTime(@Param("uid") Long uid, @Param("limitTime") long limitTime,
 			@Param("payment") BigDecimal payment);
 	
 	

--
Gitblit v1.8.0