Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

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

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

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