From 77829918c503b0ba87e8a8864a25611035a388e7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 四月 2020 17:01:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
index 880418d..cc086e4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
@@ -92,7 +92,7 @@
 	 * @return
 	 */
 	BigDecimal getTotalMoneyByTypeAndUidWithDate(@Param("uid") Long uid, @Param("typeList") List<String> typeList,
-			@Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+			@Param("minDate") Date minDate, @Param("maxDate") Date maxDate, @Param("show")Integer show);
 
 	/**
 	 * 鏍规嵁绫诲瀷锛岀敤鎴稩D锛屽敮涓�鏍囪瘑鏌ヨ

--
Gitblit v1.8.0