Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 74be2e325a3bc4dbe95e9825c18574e1102877c5

 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();