From ca81ac257960fcb135fe542a49c28bc871b14e2a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 13 五月 2019 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
index 76a3fce..227532b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
@@ -92,7 +92,14 @@
 	 * @return
 	 */
 	int countTodayComplete();
-	
+
 	double countTodayMoney(@Param("uid") Long uid);
 
+	/**
+	 * 鑾峰彇琛ュ伩閲戦
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal computeCompensateByUid(Long uid);
 }
\ No newline at end of file

--
Gitblit v1.8.0