From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 07 十二月 2019 18:14:43 +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/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