Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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

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

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