Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -148,7 +148,7 @@ public class AlertCalledController extends BaseController {
                                                       String alertSourceCode,
                                                       String callTimeStart,
                                                       String callTimeEnd){
-        /* Page<AlertCalled> pageBean;
+       /* Page<AlertCalled> pageBean;
         IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
         page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
@@ -159,7 +159,7 @@ public class AlertCalledController extends BaseController {
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             page = new Page<>();
             page.setCurrent(0L);
-            page.setSize(10L);
+            page.setSize(Long.MAX_VALUE);
         } else {
             page.setCurrent( (Long.parseLong(pageNum) - 1) * Long.parseLong(pageSize));
             page.setSize(Long.parseLong(pageSize));