更新重合点逻辑及多点重合显示方式

ZhuDongming

2019-07-30 4bf0125f2cbc291b763a3c0a83629a470189a771

 src/main/java/com/moral/entity/alarm/AlarmStyle.java

@@ -2,5 +2,5 @@

public enum AlarmStyle {
    //微信，邮件，短信，语音
    weixin,email,sms,vioce
    weixin,email,sms,voice
}