Merge remote-tracking branch 'origin/master'

admin

2019-05-24 d126b83f5d65f612ec93475b976fc5b5e2d6132a

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java

@@ -472,7 +472,7 @@
            }

         }

         

         int count = (int) activityService.getRecommendActivityCount();

         int count = (int) activityService.getRecommendActivityCount(key);



         int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

         PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);