From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 29 十一月 2019 17:37:01 +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 3e2a794..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, int type, 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,int type, Date maxTime); + public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,Integer type, Date maxTime); /** * 璧勯噾鏄庣粏璇︽儏鍒楄〃锛堣�佺増鏈級 -- Gitblit v1.8.0