Merge remote-tracking branch 'origin/master'

沈斌

2018-02-02 e60f6e849f43cb894fb96646de71304cf2524827

1
2
3
4
5
6
package com.moral.entity.alarm;
 
public enum AlarmStyle {
    //微信，邮件，短信，语音
    weixin,email,sms,voice
}