Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

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

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

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