From 47b369e9e644373ca0e6c011a9093868f57e5d92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 02 六月 2020 09:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
index 00d1579..d6b7abe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
@@ -85,10 +85,10 @@
* @throws
*/
@Transactional(rollbackFor = Exception.class)
- public void addTeamDividents(Long uid, Date preSendTime, BigDecimal money)
+ public void addTeamDividents(Long uid, Date preSendTime, BigDecimal money,int type)
throws TeamEincomeRecordException, ParamsException {
String day = TimeUtil.getGernalTime(preSendTime.getTime(), "yyyy-MM-dd");
- TeamEincomeRecord record = TeamEincomeRecordFactory.createTeamDividents(day, uid, money, null);
+ TeamEincomeRecord record = TeamEincomeRecordFactory.createTeamDividents(day, uid, money,type, null);
teamEincomeRecordService.addTeamEincomeRecord(record);
}
--
Gitblit v1.8.0