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

@@ -216,7 +216,7 @@ public class AlertCalledController extends BaseController {
                                                       String callTimeEnd,
                                                       String callTimeStart,
                                                       String systemSourceCode,
-                                                      String isFatherAlert) {
+                                                     @RequestParam(value ="isFatherAlert",required = false) String isFatherAlert) {
        /* Page<AlertCalled> pageBean;
         IPage<AlertCalled> page;
         QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();