From 34b542007f7e0dd4e1fdffecbd12a377aa953d68 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 九月 2019 17:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
index 75835c0..7a965d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
@@ -149,7 +149,7 @@
 						? "0" + monthMap.get(key).getMonth().getMonth() : monthMap.get(key).getMonth().getMonth();
 				dateFormat.add(date);
 			}
-			List<IntegralMonthVO> voList = integralDetailMapper.selectMonthMoneyByUid(uid, dateFormat, type);
+			List<IntegralMonthVO> voList = integralDetailMapper.selectMonthMoneyByUid(uid, dateFormat);
 
 			int p = 0;
 			keys = monthMap.keySet().iterator();

--
Gitblit v1.8.0