From 59bfbce44674e52aefbe883233ffaea93d750a8f Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 25 十一月 2019 09:56:17 +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/count/HongBaoV2CountService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 c76d32c..837016f 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 @@ -184,7 +184,7 @@ public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime); - /** + /** * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟 * @param uid * @param teamUid @@ -199,6 +199,6 @@ * @param teamUid 涓嬬骇id * @return */ - public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid); + public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid); } -- Gitblit v1.8.0