Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-07 46670e34c1105649da6091a0829b9451c9fe5b37

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

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

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