From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 21 八月 2019 10:45:38 +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/integral/IntegralDetailService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralDetailService.java index 127c787..ae5de91 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralDetailService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralDetailService.java @@ -14,7 +14,7 @@ * @param maxTime * @return */ - public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime); + public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime, Integer type); /** * 鏄庣粏缁熻 @@ -23,7 +23,7 @@ * @param maxTime * @return */ - public long countDetailForClient(Long uid, Long detailId, Date maxTime); + public long countDetailForClient(Long uid, Long detailId, Date maxTime, Integer type); -- Gitblit v1.8.0