From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java
index 7ee7f90..050eebd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java
@@ -19,22 +19,22 @@
 	 * 
 	 * @param uid
 	 */
-	public void inviteSettleTB(Long uid,Date maxPregetTime) throws OrderMoneySettleException;
+	public void inviteSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
-	public void inviteSettleJD(Long uid,Date maxPregetTime) throws OrderMoneySettleException;
+	public void inviteSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
-	public void inviteSettlePDD(Long uid,Date maxPregetTime) throws OrderMoneySettleException;
+	public void inviteSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
 	/**
 	 * 鍒嗕韩璧氱粨绠�
 	 * 
 	 * @param uid
 	 */
-	public void shareSettleTB(Long uid) throws OrderMoneySettleException;
+	public void shareSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
-	public void shareSettleJD(Long uid) throws OrderMoneySettleException;
+	public void shareSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
-	public void shareSettlePDD(Long uid) throws OrderMoneySettleException;
+	public void shareSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException;
 
 	/**
 	 * 鑷喘缁撶畻
@@ -50,7 +50,7 @@
 	 * @param taskKey
 	 * @throws OrderMoneySettleException
 	 */
-	public void inviteSubsidySettle(Long uid, String taskKey,Date maxPreGetTime)
+	public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime)
 			throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException;
 
 }

--
Gitblit v1.8.0