Merge remote-tracking branch 'origin/master'

jinpengyong

2020-05-21 a46f5f1db19dc1af644a4ed013bb12555621e135

 src/main/java/com/moral/service/impl/AlarmServiceImpl.java

@@ -107,6 +107,7 @@
                    map2.put("1", list1);
                    map2.put("2", list2);
                    map2.put("3", list3);
                    break;
                }
            }
        }