From 1cb05ff7d74339cb6d5abe1c0d430e7fdb6e0fda Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期六, 14 三月 2020 15:15:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index aed93af..5952114 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -229,7 +229,7 @@
 	 * @param payment
 	 * @return
 	 */
-	public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment);
+	public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
 
 	/**
 	 * 缁熻涓嶅悓鏃堕棿锛氬鍔�

--
Gitblit v1.8.0