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/impl/count/HongBaoV2CountServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 3b57c88..17090c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -297,13 +297,13 @@
return hongBaoV2CountMapper.countAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
}
- @Override
+ @Override
public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
return hongBaoV2CountMapper.getOrderRewardByTeamUid(uid, teamUid, endTime);
}
@Override
public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid) {
- return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
+ return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
}
}
--
Gitblit v1.8.0