合并sql

ZhuDongming

2019-08-19 f1374915909bb5bddb8d3a7fad84b3955fd69778

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

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

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