Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 1cb3ee82ab49b221be2c4ec65bc70bc354fc8d8b

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