From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
index 70f67de..be78c65 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
@@ -33,7 +33,7 @@
 	 * @param maxTime
 	 * @return
 	 */
-	public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);
+	public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Integer type, Date maxTime);
 
 	/**
 	 * 瀹㈡埛绔煡璇㈢敤鎴风殑璧勯噾璁板綍鐨勬潯鏁帮紙璁$畻鏈堢粺璁★級
@@ -43,7 +43,7 @@
 	 * @param maxTime
 	 * @return
 	 */
-	public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);
+	public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,Integer type, Date maxTime);
 
 	/**
 	 * 璧勯噾鏄庣粏璇︽儏鍒楄〃锛堣�佺増鏈級

--
Gitblit v1.8.0