Merge branch 'div1'

yujian

2019-01-12 96a415a0de73542ddb5da7eaa61e4d7e55065ae3

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

@@ -658,8 +658,6 @@
            return;

         }

         

         //double sumMoney = userInfoService.querySumMoney(key, userType, days, startTime, endTime);

			
         long count = userInfoService.queryCount(key, userType, days, startTime, endTime);



         int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);