From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' 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 f800284..977d1e5 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
@@ -204,7 +204,7 @@
 	 * @param type 璁㈠崟绫诲瀷
 	 * @return
 	 */
-	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
 
 	/**
 	 * 缁熻宸茬粨绠�

--
Gitblit v1.8.0