From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
index 1fca017..0e9e4da 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -184,7 +184,7 @@
 		}
 		
 		for (SpecialCard specialCard: listObj) {
-			long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null);
+			long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null, null);
 			specialCard.setTotalSpecial(totalSpecial);
 			
 			Date startTime = specialCard.getStartTime();

--
Gitblit v1.8.0