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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java

@@ -94,7 +94,7 @@
         // 统计今日之前的

         if (betweenDays > 0) {

            for (int i = 1; i <= betweenDays; i++ ) {

               addUserActiveNumHistory(DateUtil.plusDay(i, history.getDay()));

               addUserActiveNumHistory(DateUtil.plusDay(i, lastDay));

            }

         }

         // 重新统计今日